1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
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"])
|
