summaryrefslogtreecommitdiff
path: root/gnome/applet/applet.c
diff options
context:
space:
mode:
authorTambet Ingo <tambet@ximian.com>2006-10-11 08:21:53 +0000
committerTambet Ingo <tambet@gmail.com>2006-10-11 08:21:53 +0000
commit7a8d19ab335df8d45c786e7f62cd3ca26f69f51e (patch)
treec13d3c5deee7ec024bf6c22db0c983b30fa762ee /gnome/applet/applet.c
parent11b156eb0fa1a4bd2cebef3ac3729a6fc7820b72 (diff)
downloadNetworkManager-SoC_2006.tar.gz
2006-10-11 Tambet Ingo <tambet@ximian.com>SoC_2006
* dialup-services/Makefile: Remove from CVS. * dialup-services/Makefile.am: New file. * src/backends/NetworkManager*: Fix includes. * src/dialup/ppp/nm-pppd-plugin.c: Ditto. * src/dialup/ppp/nm-ppp-service.c: Ditto. * gnome/applet/applet.c (nma_class_init): Append our icon directory to theme search path. Fix a typo. * gnome/applet/Makefile.am: Use the correct path to icons. * gnome/vpn-properties/Makefile.am: Ditto. * gnome/dialup-properties/pppoe/Makefile.am: Ditto. * gnome/dialup-properties/modem/Makefile.am: Ditto. * gnome/dialup-properties/btgprs/Makefile.am: Ditto. * gnome/dialup-properties/Makefile.am: Ditto. * gnome/dialup-auth/pppoe/Makefile.am: Ditto. * gnome/dialup-auth/ppp/Makefile.am: Ditto. * configure.in: Remove local hacks and replace them with AS_AC_EXPAND. Expand all variables that are used in .in files. * autogen.sh: Include . to aclocal's search path to get as-ac-expand.m4 included. * as-ac-expand.m4: New file. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/branches/SoC_2006@2054 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
Diffstat (limited to 'gnome/applet/applet.c')
-rw-r--r--gnome/applet/applet.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/gnome/applet/applet.c b/gnome/applet/applet.c
index 47fd77ecaf..e53c50d8f6 100644
--- a/gnome/applet/applet.c
+++ b/gnome/applet/applet.c
@@ -147,6 +147,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;
}
@@ -580,7 +583,7 @@ void nma_show_dialup_failure_alert (NMApplet *applet, const char *member, const
#else
msg = g_strdup_printf ("<span weight=\"bold\" size=\"larger\">%s</span>\n\n"
"%s\n\n%s", title, desc, error_msg);
- nma_show_vpn_failure_dialog (title, msg);
+ nma_show_failure_dialog (title, msg);
#endif
g_free (msg);
}