Commit 1e2564a2 authored by Robert Love's avatar Robert Love Committed by Robert Love
Browse files

2005-06-23 Robert Love <rml@novell.com>

        * 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
parent 6bb9f27d
2005-06-23 Robert Love <rml@novell.com>
* 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 <rml@novell.com>
* src/NetworkManagerDevice.c: division in assignment was flipped.
......
......@@ -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
......
......@@ -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)
......
......@@ -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);
......
......@@ -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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment