[anjuta-extras] class-inheritance: fixed #590522 remove libgnome(ui)

[Massimo Cora' <mcora src gnome org>]

commit 95336cba82947d625ac86e8891a240c946f1a392
Author: Jens Georg <mail jensge org>
Date:   Sun Aug 9 17:04:29 2009 +0200

    class-inheritance: fixed #590522 remove libgnome(ui)

 configure.ac                              |    3 +-
 plugins/class-inheritance/class-inherit.c |   31 ++++++++--------------------
 plugins/class-inheritance/class-inherit.h |    2 +-
 plugins/class-inheritance/plugin.c        |    1 -
 plugins/profiler/Makefile.am              |    9 +++++--
 5 files changed, 18 insertions(+), 28 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 2f16c7c..77abb1d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -74,7 +74,7 @@ dnl Check for libanjuta
 PKG_CHECK_MODULES(LIBANJUTA, [libanjuta-1.0 >= 2.27.0])
 
 dnl Check for libgnome
-PKG_CHECK_MODULES(GNOME, libgnome-2.0 >= $GNOME_REQUIRED libgnomeui-2.0 >= $GNOME_REQUIRED libgnomecanvas-2.0 >= $GNOME_REQUIRED)
+PKG_CHECK_MODULES(GNOME, libgnomecanvas-2.0 >= $GNOME_REQUIRED)
 
 dnl Valgrind plugin
 dnl check for libbfd
@@ -224,6 +224,7 @@ AC_SUBST(anjuta_image_dir)
 EXTRA_CFLAGS='-DPACKAGE_PIXMAPS_DIR=\""$(anjuta_image_dir)"\" -DPACKAGE_LIB_DIR=\""$(anjutalibdir)"\" -DPACKAGE_DATA_DIR=\""$(anjuta_data_dir)"\"'
 AC_SUBST(EXTRA_CFLAGS)
 
+PKG_CHECK_MODULES(LIBXML, libxml-2.0)
 AC_OUTPUT([
 Makefile
 plugins/Makefile
diff --git a/plugins/class-inheritance/class-inherit.c b/plugins/class-inheritance/class-inherit.c
index 433422b..2a47701 100644
--- a/plugins/class-inheritance/class-inherit.c
+++ b/plugins/class-inheritance/class-inherit.c
@@ -1103,22 +1103,6 @@ class_inheritance_update_graph (AnjutaClassInheritance *plugin)
 	cls_inherit_draw_graph (plugin);
 }
 
-static GnomeUIInfo canvas_menu_uiinfo[] = {
-	{ /*0*/
-	 GNOME_APP_UI_ITEM, 
-	 N_("Update"),
-	 N_("Update the graph"),
-	 on_update_menu_item_selected,
-	 NULL, 
-	 NULL,
-	 GNOME_APP_PIXMAP_NONE,
-	 NULL,
-	 0, 
-	 0, 
-	 NULL},
-	GNOMEUIINFO_END
-};
-
 void 
 class_inheritance_gtree_clear (AnjutaClassInheritance *plugin) {
 	
@@ -1186,14 +1170,17 @@ class_inheritance_base_gui_init (AnjutaClassInheritance *plugin)
 
 	/* menu create */
 	plugin->menu = gtk_menu_new ();
+
+	GtkWidget *menu_item = gtk_menu_item_new_with_label (_("Update"));
+	g_signal_connect (menu_item, "activate",
+	    (GCallback)on_update_menu_item_selected, plugin);
 	
 	/* set the user data on update selection */
-	canvas_menu_uiinfo[0].user_data = plugin;
-	
-	gnome_app_fill_menu (GTK_MENU_SHELL (plugin->menu), canvas_menu_uiinfo,
-						NULL, FALSE, 0);
-	
-	plugin->update = canvas_menu_uiinfo[0].widget;
+	gtk_menu_shell_append (GTK_MENU_SHELL (plugin->menu), menu_item);
+	gtk_widget_show_all (plugin->menu);
+
+
+	plugin->update = menu_item;
 	
 	g_object_ref (plugin->menu);
 	g_object_ref (plugin->update);
diff --git a/plugins/class-inheritance/class-inherit.h b/plugins/class-inheritance/class-inherit.h
index 14ca6ad..45e5acb 100644
--- a/plugins/class-inheritance/class-inherit.h
+++ b/plugins/class-inheritance/class-inherit.h
@@ -21,7 +21,7 @@
 #define _CLASS_INHERIT_H
 
 #include <libanjuta/interfaces/ianjuta-symbol-manager.h>
-#include <gnome.h>
+#include <libgnomecanvas/libgnomecanvas.h>
 
 #include "plugin.h"
 
diff --git a/plugins/class-inheritance/plugin.c b/plugins/class-inheritance/plugin.c
index f0c91ba..f18dac2 100644
--- a/plugins/class-inheritance/plugin.c
+++ b/plugins/class-inheritance/plugin.c
@@ -27,7 +27,6 @@
 #include <libanjuta/interfaces/ianjuta-document-manager.h>
 #include <libanjuta/interfaces/ianjuta-project-manager.h>
 #include <libanjuta/anjuta-debug.h>
-#include <gnome.h>
 #include "plugin.h"
 #include "class-inherit.h"
 
diff --git a/plugins/profiler/Makefile.am b/plugins/profiler/Makefile.am
index 0b1cba3..7307aad 100644
--- a/plugins/profiler/Makefile.am
+++ b/plugins/profiler/Makefile.am
@@ -33,9 +33,10 @@ profiler_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
 
 # Include paths
 AM_CPPFLAGS = \
-	$(GNOME_CFLAGS) \
 	$(LIBANJUTA_CFLAGS) \
-	$(EXTRA_CFLAGS)
+	$(EXTRA_CFLAGS) \
+	$(LIBXML_CFLAGS) \
+	$(GNOME_CFLAGS)
 
 if HAVE_GRAPHVIZ
 AM_CPPFLAGS += $(GRAPHVIZ_CFLAGS)
@@ -87,7 +88,9 @@ endif
 libanjuta_profiler_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
 
 # Plugin dependencies
-libanjuta_profiler_la_LIBADD = $(LIBANJUTA_LIBS) $(GNOME_LIBS) $(GIO_LIBS) $(LIBXML_LIBS)
+libanjuta_profiler_la_LIBADD = $(LIBANJUTA_LIBS) $(GIO_LIBS) \
+	$(LIBXML_LIBS) $(GRAPHVIZ_LIBS) \
+	$(GNOME_LIBS)
 
 if HAVE_GRAPHVIZ
 libanjuta_profiler_la_LIBADD += $(GRAPHVIZ_LIBS)