bug-buddy r2722 - in trunk: . src

[cosimoc svn gnome org]

Author: cosimoc
Date: Wed Sep 24 15:42:23 2008
New Revision: 2722
URL: http://svn.gnome.org/viewvc/bug-buddy?rev=2722&view=rev

Log:
2008-09-24  Cosimo Cecchi  <cosimoc gnome org>

	* configure.in:
	* src/Makefile.am:
	* src/bug-buddy.c: (get_gnome_version_info), (help_callback),
	(main):
	* src/bugzilla.c:
	* src/gnome-crash.c: (main):
	Drop dependency on libgnome and libgnomeui.


Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/src/Makefile.am
   trunk/src/bug-buddy.c
   trunk/src/bugzilla.c
   trunk/src/gnome-crash.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Wed Sep 24 15:42:23 2008
@@ -38,11 +38,9 @@
 GDK_PIXBUF_REQUIRED="gdk-pixbuf-2.0 >= 2.0.0"
 GMODULE_REQUIRED="gmodule-2.0 >= 2.0.0"
 LIBBONOBO_REQUIRED="libbonobo-2.0 >= 2.0.0"
-LIBGNOME_REQUIRED="libgnome-2.0 >= 2.0.0"
 LIBGNOMEMENU_REQUIRED="libgnome-menu >= 2.11.1"
-LIBGNOMEUI_REQUIRED="libgnomeui-2.0 >= 2.5.92"
 LIBXML_REQUIRED="libxml-2.0 >= 2.4.6"
-GTK_REQUIRED="gtk+-2.0 >= 2.12"
+GTK_REQUIRED="gtk+-2.0 >= 2.14.0"
 GIO_REQUIRED="gio-2.0 >= 2.16.0"
 LIBSOUP_REQUIRED="libsoup-2.4"
 LIBGTOP_REQUIRED="libgtop-2.0 >= 2.13.3"
@@ -54,9 +52,7 @@
 	$GMODULE_REQUIRED
 	$GIO_REQUIRED
 	$LIBBONOBO_REQUIRED
-	$LIBGNOME_REQUIRED
 	$LIBGNOMEMENU_REQUIRED
-	$LIBGNOMEUI_REQUIRED
 	$LIBXML_REQUIRED
 	$GTK_REQUIRED
 	$LIBSOUP_REQUIRED
@@ -127,7 +123,7 @@
 AC_SUBST(GNOME_BREAKPAD_LIBS)
 
 
-PKG_CHECK_MODULES(GNOME_CRASH, $LIBGNOMEUI_REQUIRED)
+PKG_CHECK_MODULES(GNOME_CRASH, $GTK_REQUIRED)
 AC_SUBST(GNOME_CRASH_CFLAGS)
 AC_SUBST(GNOME_CRASH_LIBS)
 

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Wed Sep 24 15:42:23 2008
@@ -1,6 +1,7 @@
 INCLUDES = \
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
 	-DGNOMELIBEXECDIR=\""$(libexecdir)"\"		\
+	-DDATADIR=\""$(datadir)"\"			\
 	$(WARN_CFLAGS)					\
 	$(BUG_BUDDY_CFLAGS) -I$(includedir)		\
 	-DBUDDY_DATADIR=\""$(pkgdatadir)"\"		\

Modified: trunk/src/bug-buddy.c
==============================================================================
--- trunk/src/bug-buddy.c	(original)
+++ trunk/src/bug-buddy.c	Wed Sep 24 15:42:23 2008
@@ -42,12 +42,12 @@
 #include <glib/gstdio.h>
 #include <glib/gi18n.h>
 #include <gio/gio.h>
-#include <gnome.h>
 #include <gtk/gtk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <libgnome/libgnometypebuiltins.h>
 #include <gdk/gdkx.h>
 #include <gdk/gdk.h>
+#include <gdk/gdkkeysyms.h>
+#include <bonobo-activation/bonobo-activation.h>
 
 #include <libxml/tree.h>
 #include <libxml/parser.h>
@@ -276,11 +276,8 @@
 
 	version = g_new0 (GnomeVersionInfo, 1);
 
-	xml_file = gnome_program_locate_file (NULL, GNOME_FILE_DOMAIN_DATADIR,
-					      "gnome-about/gnome-version.xml",
-					      TRUE, NULL);
-	if (!xml_file)
-		return NULL;
+	xml_file = g_build_filename (DATADIR, "gnome-about/gnome-version.xml", NULL);
+	
 	doc = xmlParseFile (xml_file);
 	g_free (xml_file);
 
@@ -288,7 +285,7 @@
 		return NULL;
 
 	platform = minor = micro = distributor = date = NULL;
-	
+
 	for (node = xmlDocGetRootElement (doc)->children; node; node = node->next) {
 		if (!strcmp ((char *)node->name, "platform"))
 			platform = xmlNodeGetContent (node);
@@ -1465,16 +1462,14 @@
 static void
 help_callback (GtkWidget *widget, gpointer user_data)
 {
-	GnomeProgram *program = (GnomeProgram *)user_data;
 	GError *error = NULL;
+	gboolean res;
 
-	gnome_help_display_desktop (program, 
-	                            "user-guide",
-	                            "user-guide", 
-	                            "feedback-bugs",
-	                            &error);
+	res = gtk_show_uri (gtk_widget_get_screen (widget),
+			    "ghelp:user-guide#feedback-bugs",
+			    gtk_get_current_event_time (), &error);
 
-	if (error) {
+	if (!res) {
 		GtkWidget *error_dialog = 
 		    gtk_message_dialog_new (NULL, 
 		                            GTK_DIALOG_MODAL,
@@ -1777,43 +1772,43 @@
 	guint progress;
 	GtkWidget *main_window;
 	GOptionContext *context;
-	GnomeProgram *program;
 	guint source_id;
 	GError *err = NULL;
 	GtkBuilder *ui = NULL;
 		
 	memset (&gopt_data,  0, sizeof (gopt_data));
 
-	bindtextdomain (PACKAGE, GNOMELOCALEDIR);
-	bind_textdomain_codeset (PACKAGE, "UTF-8");
-	textdomain (PACKAGE);
+	bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
+	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+	textdomain (GETTEXT_PACKAGE);
 
 	context = g_option_context_new (N_("\n\nBug Buddy is a utility that helps report debugging\n"
 	                                  "information to the GNOME Bugzilla when a program crashes."));
 
 	g_option_context_set_translation_domain (context, GETTEXT_PACKAGE);
-
 	g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE);
+	g_option_context_add_group (context, gtk_get_option_group (TRUE));
 
-	program = gnome_program_init (PACKAGE, VERSION,
-	                              LIBGNOMEUI_MODULE,
-	                              argc, argv,
-	                              GNOME_PARAM_GOPTION_CONTEXT, context,
-	                              GNOME_PARAM_APP_DATADIR, BUDDY_DATADIR,
- 				      GNOME_CLIENT_PARAM_SM_CONNECT, FALSE,
-	                              NULL);
+	if (!g_option_context_parse (context, &argc, &argv, &err)) {
+		g_critical ("Failed to parse arguments: %s\n", err->message);
+		g_error_free (err);
+		g_option_context_free (context);
+		exit (1);
+        }
+
+	g_option_context_free (context);
+
+	if (!bonobo_activation_is_initialized ())
+		bonobo_activation_init (argc, argv);
 
 	g_set_application_name (_("Bug Buddy"));
 	gtk_window_set_default_icon_name ("bug-buddy");
 
+	s = g_build_filename (BUDDY_DATADIR, "bug-buddy.gtkbuilder", NULL);
 
-	s = gnome_program_locate_file (NULL, GNOME_FILE_DOMAIN_APP_DATADIR,
-				       "bug-buddy.gtkbuilder", TRUE, NULL);
-	if (s) {
-		ui = gtk_builder_new ();
-		gtk_builder_add_from_file (ui, s, &err);
-		gtk_builder_set_translation_domain (ui, GETTEXT_PACKAGE);
-	}
+	ui = gtk_builder_new ();
+	gtk_builder_add_from_file (ui, s, &err);
+	gtk_builder_set_translation_domain (ui, GETTEXT_PACKAGE);
 
 	g_free (s);
 
@@ -1824,7 +1819,6 @@
 		if (err) {
 			g_error_free (err);
 		}
-		g_object_unref (program);
 		return 0;
 	}
 
@@ -1841,7 +1835,6 @@
 
 	if (gopt_data.app_file == NULL && gopt_data.package == NULL) {
 		buddy_error (NULL, _("Either --appname or --package arguments are required.\n"));	
-		g_object_unref (program);
 		return 0;
 	}	
 
@@ -1849,7 +1842,6 @@
             gopt_data.include_file == NULL && 
             gopt_data.minidump_file == NULL) {
 		buddy_error (NULL, _("Either --pid , --include or --minidump arguments are required.\n"));	
-		g_object_unref (program);
 		return 0;
 	}	
 	
@@ -1859,7 +1851,6 @@
 		buddy_error (NULL, _("Bug Buddy was unable to retrieve information regarding "
 		                     "the version of GNOME you are running.  This is most likely "
 		                     "due to a missing installation of gnome-desktop.\n"));
-		g_object_unref (program);
 		return 0;
 	}
 	
@@ -1867,7 +1858,7 @@
 
 	/* connect the signal handler for the help button */
 	g_signal_connect (gtk_builder_get_object (ui, "help-button"), "clicked", 
-	                  G_CALLBACK (help_callback), program);
+	                  G_CALLBACK (help_callback), NULL);
 
 	gtk_widget_show (main_window);
 
@@ -1916,7 +1907,6 @@
 				buddy_error (NULL, _("Bug Buddy encountered the following error when trying "
 		                     		     "to retrieve debugging information: %s\n"), err->message);
 				g_error_free (err);
-				g_object_unref (program);
 				return 0;
 			}
 
@@ -2006,7 +1996,5 @@
 	
 	gtk_main ();
 
-	g_object_unref (program);
-
 	return 0;
 }

Modified: trunk/src/bugzilla.c
==============================================================================
--- trunk/src/bugzilla.c	(original)
+++ trunk/src/bugzilla.c	Wed Sep 24 15:42:23 2008
@@ -33,7 +33,6 @@
 #include <ctype.h>
 
 #include <glib/gi18n.h>
-#include <gnome.h>
 
 #include <gmenu-tree.h>
 

Modified: trunk/src/gnome-crash.c
==============================================================================
--- trunk/src/gnome-crash.c	(original)
+++ trunk/src/gnome-crash.c	Wed Sep 24 15:42:23 2008
@@ -19,20 +19,13 @@
  */
 
 #include "config.h"
-
-#include <libgnome/gnome-program.h>
-#include <libgnomeui/gnome-client.h>
-#include <libgnomeui/gnome-ui-init.h>
+#include <gtk/gtk.h>
 
 int
 main (int argc, char *argv[])
 {
 	int *n = NULL;
-	gnome_program_init ("Crashing GNOME Program", VERSION,
-			    LIBGNOMEUI_MODULE,
-			    argc, argv,
-			    GNOME_CLIENT_PARAM_SM_CONNECT, FALSE,
-			    NULL);
+	gtk_init (&argc, &argv);
 	n[27] = 10-7-78;
 	return 0;
 }