summaryrefslogtreecommitdiffstats
path: root/meta-extras/packages/networkmanager/files/applet-no-gnome.diff
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2007-09-24 14:07:28 +0000
committerRoss Burton <ross@openedhand.com>2007-09-24 14:07:28 +0000
commitc0be929c8072b39ca081386c131a5f3896246093 (patch)
tree57ae6389d8d8309d80a544be4a27f8b2f51fe54e /meta-extras/packages/networkmanager/files/applet-no-gnome.diff
parentc41fcd67094b0b50dd45bd18e682707f76229204 (diff)
downloadpoky-c0be929c8072b39ca081386c131a5f3896246093.tar.gz
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.diff66
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 @@
1Index: src/main.c
2===================================================================
3--- src/main.c (revision 193)
4+++ src/main.c (working copy)
5@@ -27,7 +27,9 @@
6
7 #include <string.h>
8 #include <gtk/gtk.h>
9+#if 0
10 #include <libgnomeui/libgnomeui.h>
11+#endif
12 #include <glib/gi18n-lib.h>
13
14 #include "applet.h"
15@@ -36,11 +38,15 @@
16 int main (int argc, char *argv[])
17 {
18 NMApplet * applet;
19+#if 0
20 GnomeProgram * program;
21
22 program = gnome_program_init ("nm-applet", VERSION, LIBGNOMEUI_MODULE,
23 argc, argv,
24 GNOME_PARAM_NONE, GNOME_PARAM_NONE);
25+#else
26+ gtk_init (&argc, &argv);
27+#endif
28
29 bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
30 bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
31@@ -53,7 +59,9 @@
32 gtk_main ();
33
34 g_object_unref (applet);
35+#if 0
36 g_object_unref (program);
37+#endif
38
39 exit (0);
40 }
41Index: configure.ac
42===================================================================
43--- configure.ac (revision 193)
44+++ configure.ac (working copy)
45@@ -65,8 +65,7 @@
46 gtk+-2.0 >= 2.6
47 libglade-2.0
48 gconf-2.0
49- gnome-keyring-1
50- libgnomeui-2.0])
51+ gnome-keyring-1])
52
53 ##### Find out the version of DBUS we're using
54 dbus_version=`pkg-config --modversion dbus-1`
55@@ -124,11 +123,6 @@
56 fi
57 fi
58
59-PKG_CHECK_EXISTS([libgnome-2.0 >= 2.14.0],[have_libgnome_2_14=yes],[have_libgnome_2_14=no])
60-if test "$have_libgnome_2_14" = "yes"; then
61- AC_DEFINE([HAVE_LIBGNOME_2_14],[1],[Define if we have libgnome 2.14])
62-fi
63-
64 AM_CONDITIONAL(WITH_NOTIFY, test x"$enable_notify" != xno) # can't do it from inside 'if'
65 AM_CONDITIONAL([HAVE_GTK_2_10],[test "$have_gtk_2_10" = "yes"])
66