Re: [Patch] build prefix fixes

2006-10-10 Thread Dan Williams 
On Tue, 2006-10-10 at 15:40 +0300, Tambet Ingo wrote:
> Hey,
> 
> The attached patch makes nm-applet search it's icons from the installed
> prefix.

Looks good.

> Tambet
> ___
> NetworkManager-list mailing list
> NetworkManager-list@gnome.org
> http://mail.gnome.org/mailman/listinfo/networkmanager-list

___
NetworkManager-list mailing list
NetworkManager-list@gnome.org
http://mail.gnome.org/mailman/listinfo/networkmanager-list

[Patch] build prefix fixes

2006-10-10 Thread Tambet Ingo 
Hey,

The attached patch makes nm-applet search it's icons from the installed
prefix.

Tambet
Index: gnome/applet/Makefile.am
===
RCS file: /cvs/gnome/NetworkManager/gnome/applet/Makefile.am,v
retrieving revision 1.23
diff -u -r1.23 Makefile.am
--- gnome/applet/Makefile.am	13 Jul 2006 17:03:29 -	1.23
+++ gnome/applet/Makefile.am	10 Oct 2006 12:40:42 -
@@ -17,7 +17,7 @@
 	$(LIBGNOMEUI_CFLAGS)\
 	$(PANEL_APPLET_CFLAGS)\
 	$(GNOME_KEYRING_CFLAGS)\
-	-DICONDIR=\""$(datadir)/pixmaps"\"		\
+	-DICONDIR=\""$(datadir)/icons"\"		\
 	-DGLADEDIR=\""$(gladedir)"\"			\
 	-DBINDIR=\""$(bindir)"\"\
 	-DSYSCONFDIR=\""$(sysconfdir)"\"		\
Index: gnome/applet/applet.c
===
RCS file: /cvs/gnome/NetworkManager/gnome/applet/applet.c,v
retrieving revision 1.123
diff -u -r1.123 applet.c
--- gnome/applet/applet.c	9 Jul 2006 23:37:40 -	1.123
+++ gnome/applet/applet.c	10 Oct 2006 12:40:43 -
@@ -144,6 +144,9 @@
 {
 	GObjectClass *gobject_class;
 
+	gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
+ICONDIR);
+
 	gobject_class = G_OBJECT_CLASS (klass);
 	gobject_class->constructor = nma_constructor;
 }
___
NetworkManager-list mailing list
NetworkManager-list@gnome.org
http://mail.gnome.org/mailman/listinfo/networkmanager-list