From 1e2564a2032eafcc6d511d7f5fbf63f6fc35635a Mon Sep 17 00:00:00 2001 From: Robert Love Date: Thu, 23 Jun 2005 20:34:57 +0000 Subject: [PATCH] 2005-06-23 Robert Love * configure.in: remove extraneous GNOMEKEYRING directives. * gnome/applet/Makefile.am: s/GNOMEKEYRING/GNOME_KEYRING/. * gnome/applet/applet.c: nmwa_icons_init: make style local. * gnome/applet/passphrase-dialog.c: whitespace. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@744 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 7 +++++++ configure.in | 4 ---- gnome/applet/Makefile.am | 4 ++-- gnome/applet/applet.c | 29 ++++++++++++++--------------- gnome/applet/passphrase-dialog.c | 2 +- 5 files changed, 24 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index a2f06c862b..e47a1012fa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-06-23 Robert Love + + * configure.in: remove extraneous GNOMEKEYRING directives. + * gnome/applet/Makefile.am: s/GNOMEKEYRING/GNOME_KEYRING/. + * gnome/applet/applet.c: nmwa_icons_init: make style local. + * gnome/applet/passphrase-dialog.c: whitespace. + 2005-06-23 Robert Love * src/NetworkManagerDevice.c: division in assignment was flipped. diff --git a/configure.in b/configure.in index 1b790b43cb..f6491b8423 100644 --- a/configure.in +++ b/configure.in @@ -177,10 +177,6 @@ PKG_CHECK_MODULES(LIBGNOMEUI, libgnomeui-2.0) AC_SUBST(LIBGNOMEUI_CFLAGS) # is this even needed? it was typed incorrectly before AC_SUBST(LIBGNOMEUI_LIBS) -PKG_CHECK_MODULES(GNOMEKEYRING, gnome-keyring-1) -AC_SUBST(GNOMEKEYRING_CFLAGS) # is this even needed? it was typed incorrectly before -AC_SUBST(GNOMEKEYRING_LIBS) - AC_ARG_WITH(dbus-sys, AC_HELP_STRING([--with-dbus-sys=DIR], [where D-BUS system.d directory is])) if ! test -z "$with_dbus_sys" ; then diff --git a/gnome/applet/Makefile.am b/gnome/applet/Makefile.am index 5444a9f106..6fb34fc939 100644 --- a/gnome/applet/Makefile.am +++ b/gnome/applet/Makefile.am @@ -16,7 +16,7 @@ nm_applet_CPPFLAGS = \ $(GCONF_CFLAGS) \ $(LIBGNOMEUI_CFLAGS) \ $(PANEL_APPLET_CFLAGS) \ - $(GNOMEKEYRING_CFLAGS) \ + $(GNOME_KEYRING_CFLAGS) \ -DICONDIR=\""$(datadir)/pixmaps"\" \ -DGLADEDIR=\""$(gladedir)"\" \ -DBINDIR=\""$(bindir)"\" \ @@ -70,7 +70,7 @@ nm_applet_LDADD = \ $(GTK_LIBS) \ $(GCONF_LIBS) \ $(LIBGNOMEUI_LIBS) \ - $(GNOMEKEYRING_LIBS) \ + $(GNOME_KEYRING_LIBS) \ $(top_builddir)/utils/libnmutils.la \ $(NULL) diff --git a/gnome/applet/applet.c b/gnome/applet/applet.c index 98537df33a..8c2c813886 100644 --- a/gnome/applet/applet.c +++ b/gnome/applet/applet.c @@ -2323,24 +2323,23 @@ static void nmwa_icon_theme_changed (GtkIconTheme *icon_theme, NMWirelessApplet /* FIXME: force redraw */ } -const gchar *style = " \ -style \"MenuBar\" \ -{ \ - GtkMenuBar::shadow_type = GTK_SHADOW_NONE \ - GtkMenuBar::internal-padding = 0 \ -} \ -style \"MenuItem\" \ -{ \ - xthickness=0 \ - ythickness=0 \ -} \ -class \"GtkMenuBar\" style \"MenuBar\"\ -widget \"*ToplevelMenu*\" style \"MenuItem\"\ -"; - static void nmwa_icons_init (NMWirelessApplet *applet) { GtkIconTheme *icon_theme; + const gchar *style = " \ + style \"MenuBar\" \ + { \ + GtkMenuBar::shadow_type = GTK_SHADOW_NONE \ + GtkMenuBar::internal-padding = 0 \ + } \ + style \"MenuItem\" \ + { \ + xthickness=0 \ + ythickness=0 \ + } \ + class \"GtkMenuBar\" style \"MenuBar\"\ + widget \"*ToplevelMenu*\" style \"MenuItem\"\ + "; /* FIXME: Do we need to worry about other screens? */ gtk_rc_parse_string (style); diff --git a/gnome/applet/passphrase-dialog.c b/gnome/applet/passphrase-dialog.c index c026510a59..a2455afe7f 100644 --- a/gnome/applet/passphrase-dialog.c +++ b/gnome/applet/passphrase-dialog.c @@ -428,7 +428,7 @@ GtkWidget *nmi_passphrase_dialog_init (NMWirelessApplet *applet) nmwa_schedule_warning_dialog (applet, _("The NetworkManager Applet could not find some required resources (the glade file was not found).")); return NULL; } - + dialog = glade_xml_get_widget (dialog_xml, "passphrase_dialog"); gtk_widget_hide (dialog);