[Goodies-commits] r1990 - in notification-daemon-xfce/trunk: . icons icons/22x22 icons/48x48 settings

Nick Schermer nick at xfce.org
Thu Sep 7 13:14:08 CEST 2006


Author: nick
Date: 2006-09-07 11:14:00 +0000 (Thu, 07 Sep 2006)
New Revision: 1990

Added:
   notification-daemon-xfce/trunk/icons/
   notification-daemon-xfce/trunk/icons/22x22/
   notification-daemon-xfce/trunk/icons/22x22/Makefile.am
   notification-daemon-xfce/trunk/icons/22x22/notification-settings.png
   notification-daemon-xfce/trunk/icons/48x48/
   notification-daemon-xfce/trunk/icons/48x48/Makefile.am
   notification-daemon-xfce/trunk/icons/48x48/notification-settings.png
   notification-daemon-xfce/trunk/icons/Makefile.am
Removed:
   notification-daemon-xfce/trunk/settings/notification-settings.png
Modified:
   notification-daemon-xfce/trunk/ChangeLog
   notification-daemon-xfce/trunk/Makefile.am
   notification-daemon-xfce/trunk/configure.in.in
   notification-daemon-xfce/trunk/settings/Makefile.am
   notification-daemon-xfce/trunk/settings/notification-settings.desktop.in
Log:
* Created icons directory with icon-cache hook, moved
  the 48px icon into this dir and add a 22px icon for
  the preview button.
* Fix typos in .desktop file.


Modified: notification-daemon-xfce/trunk/ChangeLog
===================================================================
--- notification-daemon-xfce/trunk/ChangeLog	2006-09-07 10:23:58 UTC (rev 1989)
+++ notification-daemon-xfce/trunk/ChangeLog	2006-09-07 11:14:00 UTC (rev 1990)
@@ -1,3 +1,10 @@
+2006-09-07 13:00 nick
+
+	* Created icons directory with icon-cache hook, moved
+	  the 48px icon into this dir and add a 22px icon for
+	  the preview button.
+	* Fix typos in .desktop file.
+
 2006-09-07 11:40 nick
 
 	* Added new dbus method to reload the daemon settings.

Modified: notification-daemon-xfce/trunk/Makefile.am
===================================================================
--- notification-daemon-xfce/trunk/Makefile.am	2006-09-07 10:23:58 UTC (rev 1989)
+++ notification-daemon-xfce/trunk/Makefile.am	2006-09-07 11:14:00 UTC (rev 1990)
@@ -4,7 +4,8 @@
 	po								\
 	src								\
 	themes								\
-	settings
+	settings							\
+	icons
 
 AUTOMAKE_OPTIONS =							\
 	1.8								\

Modified: notification-daemon-xfce/trunk/configure.in.in
===================================================================
--- notification-daemon-xfce/trunk/configure.in.in	2006-09-07 10:23:58 UTC (rev 1989)
+++ notification-daemon-xfce/trunk/configure.in.in	2006-09-07 11:14:00 UTC (rev 1990)
@@ -66,10 +66,13 @@
 
 AC_OUTPUT([
 Makefile
+src/Makefile
 po/Makefile.in
-src/Makefile
+settings/Makefile
 themes/Makefile
 themes/bubble/Makefile
 themes/standard/Makefile
-settings/Makefile
+icons/Makefile
+icons/22x22/Makefile
+icons/48x48/Makefile
 ])

Added: notification-daemon-xfce/trunk/icons/22x22/Makefile.am
===================================================================
--- notification-daemon-xfce/trunk/icons/22x22/Makefile.am	                        (rev 0)
+++ notification-daemon-xfce/trunk/icons/22x22/Makefile.am	2006-09-07 11:14:00 UTC (rev 1990)
@@ -0,0 +1,8 @@
+# $Id$
+
+iconsdir = $(datadir)/icons/hicolor/22x22/apps
+icons_DATA =								\
+	notification-settings.png
+
+EXTRA_DIST =								\
+	$(icons_DATA)


Property changes on: notification-daemon-xfce/trunk/icons/22x22/Makefile.am
___________________________________________________________________
Name: svn:keywords
   + Id

Added: notification-daemon-xfce/trunk/icons/22x22/notification-settings.png
===================================================================
(Binary files differ)


Property changes on: notification-daemon-xfce/trunk/icons/22x22/notification-settings.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: notification-daemon-xfce/trunk/icons/48x48/Makefile.am
===================================================================
--- notification-daemon-xfce/trunk/icons/48x48/Makefile.am	                        (rev 0)
+++ notification-daemon-xfce/trunk/icons/48x48/Makefile.am	2006-09-07 11:14:00 UTC (rev 1990)
@@ -0,0 +1,8 @@
+# $Id$
+
+iconsdir = $(datadir)/icons/hicolor/48x48/apps
+icons_DATA =								\
+	notification-settings.png
+
+EXTRA_DIST =								\
+	$(icons_DATA)


Property changes on: notification-daemon-xfce/trunk/icons/48x48/Makefile.am
___________________________________________________________________
Name: svn:keywords
   + Id

Added: notification-daemon-xfce/trunk/icons/48x48/notification-settings.png
===================================================================
(Binary files differ)


Property changes on: notification-daemon-xfce/trunk/icons/48x48/notification-settings.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: notification-daemon-xfce/trunk/icons/Makefile.am
===================================================================
--- notification-daemon-xfce/trunk/icons/Makefile.am	                        (rev 0)
+++ notification-daemon-xfce/trunk/icons/Makefile.am	2006-09-07 11:14:00 UTC (rev 1990)
@@ -0,0 +1,18 @@
+# $Id$
+
+SUBDIRS =								\
+	22x22								\
+	48x48
+
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+
+install-data-hook:
+	@-if test -z "$(DESTDIR)"; then					\
+                echo "Updating Gtk icon cache.";			\
+                $(gtk_update_icon_cache);				\
+        else								\
+                echo "*** Icon cache not updated. Remember to run:";	\
+		echo "***";						\
+                echo "***   $(gtk_update_icon_cache)";			\
+		echo "***";						\
+        fi


Property changes on: notification-daemon-xfce/trunk/icons/Makefile.am
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: notification-daemon-xfce/trunk/settings/Makefile.am
===================================================================
--- notification-daemon-xfce/trunk/settings/Makefile.am	2006-09-07 10:23:58 UTC (rev 1989)
+++ notification-daemon-xfce/trunk/settings/Makefile.am	2006-09-07 11:14:00 UTC (rev 1990)
@@ -77,19 +77,10 @@
 endif
 
 ##
-## notification settings icon
-##
-iconsdir = $(datadir)/icons/hicolor/48x48/apps
-icons_DATA =								\
-	notification-settings.png
-
-
-##
 ## automake stuff
 ##
 CLEANFILES =								\
 	$(desktop_DATA)
 
 EXTRA_DIST =								\
-	$(desktop_in_files)						\
-	$(icons_DATA)
+	$(desktop_in_files)

Modified: notification-daemon-xfce/trunk/settings/notification-settings.desktop.in
===================================================================
--- notification-daemon-xfce/trunk/settings/notification-settings.desktop.in	2006-09-07 10:23:58 UTC (rev 1989)
+++ notification-daemon-xfce/trunk/settings/notification-settings.desktop.in	2006-09-07 11:14:00 UTC (rev 1990)
@@ -9,7 +9,6 @@
 StartupNotify=true
 OnlyShowIn=XFCE;
 Categories=X-XFCE;Settings;DesktopSettings;
-_Name=Notification Settings
+_Name=Xfce 4 Notification Settings
 _GenericName=Notification Settings
 _Comment=Customize the notification daemon settings
-Name=notification-settings.desktop.in

Deleted: notification-daemon-xfce/trunk/settings/notification-settings.png




More information about the Goodies-commits mailing list