diff options
| author | Ross Burton <ross@openedhand.com> | 2007-09-24 14:07:28 +0000 |
|---|---|---|
| committer | Ross Burton <ross@openedhand.com> | 2007-09-24 14:07:28 +0000 |
| commit | c0be929c8072b39ca081386c131a5f3896246093 (patch) | |
| tree | 57ae6389d8d8309d80a544be4a27f8b2f51fe54e /meta-extras/packages/networkmanager/files/applet-no-gnome.diff | |
| parent | c41fcd67094b0b50dd45bd18e682707f76229204 (diff) | |
| download | openembedded-core-c0be929c8072b39ca081386c131a5f3896246093.tar.gz openembedded-core-c0be929c8072b39ca081386c131a5f3896246093.tar.bz2 openembedded-core-c0be929c8072b39ca081386c131a5f3896246093.zip | |
Add network-manager-applet
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2775 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta-extras/packages/networkmanager/files/applet-no-gnome.diff')
| -rw-r--r-- | meta-extras/packages/networkmanager/files/applet-no-gnome.diff | 66 |
1 files changed, 66 insertions, 0 deletions
diff --git a/meta-extras/packages/networkmanager/files/applet-no-gnome.diff b/meta-extras/packages/networkmanager/files/applet-no-gnome.diff new file mode 100644 index 0000000000..761c3ab7a7 --- /dev/null +++ b/meta-extras/packages/networkmanager/files/applet-no-gnome.diff @@ -0,0 +1,66 @@ +Index: src/main.c +=================================================================== +--- src/main.c (revision 193) ++++ src/main.c (working copy) +@@ -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 @@ + gtk_main (); + + g_object_unref (applet); ++#if 0 + g_object_unref (program); ++#endif + + exit (0); + } +Index: configure.ac +=================================================================== +--- configure.ac (revision 193) ++++ configure.ac (working copy) +@@ -65,8 +65,7 @@ + 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` +@@ -124,11 +123,6 @@ + fi + fi + +-PKG_CHECK_EXISTS([libgnome-2.0 >= 2.14.0],[have_libgnome_2_14=yes],[have_libgnome_2_14=no]) +-if test "$have_libgnome_2_14" = "yes"; then +- AC_DEFINE([HAVE_LIBGNOME_2_14],[1],[Define if we have libgnome 2.14]) +-fi +- + AM_CONDITIONAL(WITH_NOTIFY, test x"$enable_notify" != xno) # can't do it from inside 'if' + AM_CONDITIONAL([HAVE_GTK_2_10],[test "$have_gtk_2_10" = "yes"]) + |