diff options
author | Koen Kooi <koen@openembedded.org> | 2007-09-29 07:45:49 +0000 |
---|---|---|
committer | Koen Kooi <koen@openembedded.org> | 2007-09-29 07:45:49 +0000 |
commit | 8cd45ca0a06cdccf07efae39e03656a68512637d (patch) | |
tree | 8e065e3a302127949e3867a1ae527a345ad644fe /packages/networkmanager/files/applet-no-gnome.diff | |
parent | 3b4ef5e53b95cf3e715188f05e54143aad4abf54 (diff) |
network-manager svn: sync with poky
Diffstat (limited to 'packages/networkmanager/files/applet-no-gnome.diff')
-rw-r--r-- | packages/networkmanager/files/applet-no-gnome.diff | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/packages/networkmanager/files/applet-no-gnome.diff b/packages/networkmanager/files/applet-no-gnome.diff new file mode 100644 index 0000000000..e098e8c9ed --- /dev/null +++ b/packages/networkmanager/files/applet-no-gnome.diff @@ -0,0 +1,59 @@ +--- + configure.ac | 3 +-- + src/main.c | 8 ++++++++ + 2 files changed, 9 insertions(+), 2 deletions(-) + +Index: src/main.c +=================================================================== +--- src/main.c.orig 2007-09-26 10:39:16.000000000 +0100 ++++ src/main.c 2007-09-26 10:39:37.000000000 +0100 +@@ -27,7 +27,9 @@ + + #include <string.h> + #include <gtk/gtk.h> ++#if 0 + #include <libgnomeui/libgnomeui.h> ++#endif + #include <glib/gi18n-lib.h> + + #include "applet.h" +@@ -36,11 +38,15 @@ + int main (int argc, char *argv[]) + { + NMApplet * applet; ++#if 0 + GnomeProgram * program; + + program = gnome_program_init ("nm-applet", VERSION, LIBGNOMEUI_MODULE, + argc, argv, + GNOME_PARAM_NONE, GNOME_PARAM_NONE); ++#else ++ gtk_init (&argc, &argv); ++#endif + + bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR); + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); +@@ -53,7 +59,9 @@ int main (int argc, char *argv[]) + gtk_main (); + + g_object_unref (applet); ++#if 0 + g_object_unref (program); ++#endif + + exit (0); + } +Index: configure.ac +=================================================================== +--- configure.ac.orig 2007-09-26 10:39:30.000000000 +0100 ++++ configure.ac 2007-09-26 10:39:37.000000000 +0100 +@@ -65,8 +65,7 @@ PKG_CHECK_MODULES(NMA, + gtk+-2.0 >= 2.6 + libglade-2.0 + gconf-2.0 +- gnome-keyring-1 +- libgnomeui-2.0]) ++ gnome-keyring-1]) + + ##### Find out the version of DBUS we're using + dbus_version=`pkg-config --modversion dbus-1` |