2006-10-11 Tambet Ingo <tambet@ximian.com>

* gnome/applet/applet.c (nma_class_init): Append our icon directory to
	theme search path.

	* gnome/applet/Makefile.am: Use the correct path to icons.

	* gnome/vpn-properties/Makefile.am: Ditto.


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2053 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Tambet Ingo 2006-10-11 08:07:52 +00:00 committed by Tambet Ingo
parent de63f5ffc9
commit 969e56cbeb
3 changed files with 7 additions and 5 deletions

View file

@ -17,7 +17,7 @@ nm_applet_CPPFLAGS = \
$(LIBGNOMEUI_CFLAGS) \
$(PANEL_APPLET_CFLAGS) \
$(GNOME_KEYRING_CFLAGS) \
-DICONDIR=\""$(datadir)/pixmaps"\" \
-DICONDIR=\""$(datadir)/icons"\" \
-DGLADEDIR=\""$(gladedir)"\" \
-DBINDIR=\""$(bindir)"\" \
-DSYSCONFDIR=\""$(sysconfdir)"\" \

View file

@ -144,6 +144,9 @@ static void nma_class_init (NMAppletClass *klass)
{
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;
}
@ -2303,7 +2306,6 @@ static void nma_dropdown_menu_deactivate_cb (GtkWidget *menu, NMApplet *applet)
gtk_widget_set_state (applet->event_box, GTK_STATE_NORMAL);
}
/*
* nma_setup_widgets
*

View file

@ -21,13 +21,13 @@ nm_vpn_properties_CFLAGS = \
$(GCONF_CFLAGS) \
$(GMODULE_CFLAGS) \
$(LIBGNOMEUI_CFLAGS) \
-DSYSCONFDIR=\"$(sysconfdir)\" \
-DICONDIR=\""$(datadir)/pixmaps"\" \
-DSYSCONFDIR=\"$(sysconfdir)\" \
-DICONDIR=\""$(datadir)/icons"\" \
-DGLADEDIR=\""$(gladedir)"\" \
-DG_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \
-DGNOME_DISABLE_DEPRECATED \
-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
-DVERSION=\"$(VERSION)\" \
$(NULL)