[uim-commit] r1084 - trunk/helper

[tkng at freedesktop.org]

Author: tkng
Date: 2005-07-31 00:17:49 -0700 (Sun, 31 Jul 2005)
New Revision: 1084

Modified:
   trunk/helper/GNOME_UimApplet.server.in.in
   trunk/helper/Makefile.am
Log:
* helper/GNOME_UimApplet.server.in.in: Changed the icon.


Modified: trunk/helper/GNOME_UimApplet.server.in.in
===================================================================
--- trunk/helper/GNOME_UimApplet.server.in.in	2005-07-31 07:15:19 UTC (rev 1083)
+++ trunk/helper/GNOME_UimApplet.server.in.in	2005-07-31 07:17:49 UTC (rev 1084)
@@ -23,6 +23,6 @@
         <oaf_attribute name="name" type="string" _value="uim Applet"/>
         <oaf_attribute name="description" type="string" _value="uim applet for the GNOME2 panel"/>
         <oaf_attribute name="panel:category" type="string" _value="Utility"/>
-        <oaf_attribute name="panel:icon" type="string" value="gnome-applets.png"/>
+        <oaf_attribute name="panel:icon" type="string" value="@UIM_PIXMAPSDIR@/uim-icon.png"/>
 </oaf_server>
 </oaf_info>

Modified: trunk/helper/Makefile.am
===================================================================
--- trunk/helper/Makefile.am	2005-07-31 07:15:19 UTC (rev 1083)
+++ trunk/helper/Makefile.am	2005-07-31 07:17:49 UTC (rev 1084)
@@ -26,6 +26,7 @@
 
 $(server_in_files): $(server_in_in_files) Makefile
 	sed s, at LIBEXECDIR@,$(libexecdir),g <$< >$@
+	sed s, at UIM_PIXMAPSDIR@,$(uim_pixmapsdir),g <$< >$@
 
 DISTCLEANFILES = GNOME_UimApplet.server.in GNOME_UimApplet.server
 
@@ -78,7 +79,7 @@
 uim_pref_gtk_SOURCES  = pref-gtk.c pref-gtk-custom-widgets.c pref-gtk-custom-widgets.h
 uim_pref_gtk_LDADD    = @GTK2_LIBS@ $(top_builddir)/uim/libuim-custom.la \
 			$(top_builddir)/uim/libuim.la
-uim_pref_gtk_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
+uim_pref_gtk_CPPFLAGS = $(helper_defs) -I$(top_srcdir) -I$(top_builddir)
 uim_pref_gtk_CFLAGS   = @GTK2_CFLAGS@ -Wall
 endif