gnome-utils r8205 - in trunk/gnome-dictionary: . src

[cosimoc svn gnome org]

Author: cosimoc
Date: Mon Dec 15 12:10:27 2008
New Revision: 8205
URL: http://svn.gnome.org/viewvc/gnome-utils?rev=8205&view=rev

Log:
2008-12-15  Cosimo Cecchi  <cosimoc gnome org>

	* src/gdict-applet.c: (gdict_applet_cmd_help),
	(gdict_applet_factory), (main):
	Remove libgnome dependency and use stock PANEL_APPLET_BONOBO_FACTORY
	macro to initialize applet (#563970).


Modified:
   trunk/gnome-dictionary/ChangeLog
   trunk/gnome-dictionary/src/gdict-applet.c

Modified: trunk/gnome-dictionary/src/gdict-applet.c
==============================================================================
--- trunk/gnome-dictionary/src/gdict-applet.c	(original)
+++ trunk/gnome-dictionary/src/gdict-applet.c	Mon Dec 15 12:10:27 2008
@@ -30,8 +30,6 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gtk/gtk.h>
 #include <gconf/gconf-client.h>
-#include <libgnomeui/gnome-authentication-manager.h>
-#include <libgnomeui/gnome-help.h>
 
 #include "gdict-applet.h"
 #include "gdict-about.h"
@@ -739,13 +737,11 @@
 		       const gchar       *cname)
 {
   GError *err = NULL;
+
+  gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (applet)),
+		"ghelp:gnome-dictionary#gnome-dictionary-applet",
+		gtk_get_current_event_time (), &err);
   
-  gnome_help_display_desktop_on_screen (NULL,
-  					"gnome-dictionary",
-  					"gnome-dictionary",
-  					"gnome-dictionary-applet",
-  					gtk_widget_get_screen (GTK_WIDGET (applet)),
-  					&err);
   if (err)
     {
       gdict_show_error_dialog (NULL,
@@ -1286,8 +1282,9 @@
 {
   gboolean retval = FALSE;
 
-  if ((!strcmp (iid, "OAFIID:GNOME_DictionaryApplet")) ||
-      (!strcmp (iid, "OAFIID:GNOME_GDictApplet")))
+  if (((!strcmp (iid, "OAFIID:GNOME_DictionaryApplet")) ||
+       (!strcmp (iid, "OAFIID:GNOME_GDictApplet"))) &&
+      gdict_create_data_dir ())
     {
       /* Set up the menu */
       panel_applet_setup_menu_from_file (applet, UIDATADIR,
@@ -1306,39 +1303,27 @@
 
   return retval;
 }
-#endif /* !GDICT_APPLET_STAND_ALONE */
+
+/* this defines the main () for the applet */
+PANEL_APPLET_BONOBO_FACTORY ("OAFIID:GNOME_DictionaryApplet_Factory",
+			     "gnome-dictionary-applet", VERSION,
+			     GDICT_TYPE_APPLET,
+			     gdict_applet_factory,
+			     NULL);
+
+#else /* GDICT_APPLET_STAND_ALONE */
 
 int
 main (int argc, char *argv[])
 {
-#ifdef GDICT_APPLET_STAND_ALONE
   GtkWidget *window;
   GtkWidget *applet;
-#endif
 
   /* gettext stuff */
   bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
   textdomain (GETTEXT_PACKAGE);
 
-#ifndef GDICT_APPLET_STAND_ALONE
-  gnome_authentication_manager_init();
-
-  gnome_program_init ("gnome-dictionary-applet", VERSION,
-		      LIBGNOMEUI_MODULE,
-		      argc, argv,
-		      GNOME_CLIENT_PARAM_SM_CONNECT, FALSE,
-		      GNOME_PROGRAM_STANDARD_PROPERTIES,
-		      NULL);
-
-  if (!gdict_create_data_dir ())
-    return EXIT_FAILURE;
-
-  return panel_applet_factory_main ("OAFIID:GNOME_DictionaryApplet_Factory",
-		                    GDICT_TYPE_APPLET,
-				    gdict_applet_factory,
-				    NULL);
-#else
   gtk_init (&argc, &argv);
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
@@ -1359,5 +1344,6 @@
   gtk_main ();
   
   return 0;
-#endif /* !GDICT_APPLET_STAND_ALONE */
 }
+
+#endif /* !GDICT_APPLET_STAND_ALONE */