Package: gnome-main-menu / 0.9.14-1

0001-Drop-usage-of-libgnome-2.0-and-libgnomeui-2.0.patch Patch series | download
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
From 38bddf5d6a2051967b3daaa5239204e7050b3261 Mon Sep 17 00:00:00 2001
From: Julian Andres Klode <jak@debian.org>
Date: Wed, 5 May 2010 16:57:44 +0200
Subject: [PATCH 1/6] Drop usage of libgnome-2.0 and libgnomeui-2.0

Drop the complete usage of libgnome-2.0 and libgnomeui-2.0
from main-menu.c and remove them from the list of used modules
in configure.in

https://bugzilla.gnome.org/show_bug.cgi?id=591001
---
 configure.in              |    2 +-
 main-menu/src/main-menu.c |   10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/configure.in b/configure.in
index 2f61406..c2a47ce 100644
--- a/configure.in
+++ b/configure.in
@@ -53,7 +53,7 @@ if test "x$NM_GLIB" = "x"; then
 	PKG_CHECK_EXISTS(libnm_glib, [ NM_GLIB=libnm_glib ], [ AC_ERROR(cannot find NetworkManager Glib library) ])
 fi
 
-PKG_CHECK_MODULES(MAIN_MENU, [ $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 NetworkManager $NM_GLIB >= 0.7.0 libnm-util >= 0.7.0 x11 hal-storage cairo ])
+PKG_CHECK_MODULES(MAIN_MENU, [ $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 dbus-glib-1 NetworkManager $NM_GLIB >= 0.7.0 libnm-util >= 0.7.0 x11 hal-storage cairo ])
 
 AC_CHECK_HEADERS(iwlib.h, [ AC_CHECK_LIB(iw, iw_sockets_open, have_iwlib=yes, have_iwlib=no, -lm)], have_iwlib=no)
 
diff --git a/main-menu/src/main-menu.c b/main-menu/src/main-menu.c
index 476805b..15f20cd 100644
--- a/main-menu/src/main-menu.c
+++ b/main-menu/src/main-menu.c
@@ -24,7 +24,6 @@
 
 #include <glib.h>
 #include <panel-applet.h>
-#include <libgnomeui/libgnomeui.h>
 #include <string.h>
 #include <libslab/slab.h>
 
@@ -43,7 +42,10 @@ PANEL_APPLET_BONOBO_FACTORY ("OAFIID:GNOME_MainMenu_Factory", PANEL_TYPE_APPLET,
 static gboolean
 main_menu_applet_init (PanelApplet *applet, const gchar *iid, gpointer user_data)
 {
-	gchar *argv [1] = { "slab" };
+	int argc = 1;
+	gchar *_argv [1] = { "slab" };
+	// Needed for calling gtk_init.
+	gchar **argv = _argv;
 
 	libslab_checkpoint_init (CHECKPOINT_CONFIG_BASENAME, CHECKPOINT_FILE_BASENAME);
 
@@ -65,7 +67,9 @@ main_menu_applet_init (PanelApplet *applet, const gchar *iid, gpointer user_data
 	textdomain (GETTEXT_PACKAGE);
 #endif
 
-	gnome_program_init (PACKAGE, VERSION, LIBGNOMEUI_MODULE, 1, argv, NULL, NULL);
+	gtk_init (&argc, &argv);
+	g_set_prgname (PACKAGE);
+	g_set_application_name (_("GNOME Main Menu"));
 
 	libslab_checkpoint ("Migrating old configurations");
 	move_system_area_to_new_set ();
-- 
1.7.1