New revision, fixing a bug with the dictionary applet (bug #95746)

Package-Manager: portage-2.0.51.22-r1

5 files changed, 288 insertions, 17 deletions

diff --git a/gnome-extra/gnome-utils/ChangeLog b/gnome-extra/gnome-utils/ChangeLog
index 378bbca19770..b465088c43d0 100644
--- a/gnome-extra/gnome-utils/ChangeLog
+++ b/gnome-extra/gnome-utils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/gnome-utils
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/ChangeLog,v 1.90 2005/07/02 15:04:56 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/ChangeLog,v 1.91 2005/07/05 21:04:33 leonardop Exp $
+
+*gnome-utils-2.10.1-r1 (05 Jul 2005)
+
+  05 Jul 2005; Leonardo Boshell <leonardop@gentoo.org>
+  gnome-utils-2.10.1-r1.ebuild, files/gnome-utils-2.10.1-gdict_pref.patch:
+  Added upstream patch to fix the handling of settings in the dictionary
+  applet.  Resolves bug #95746.
 
   02 Jul 2005; Bryan Østergaard <kloeri@gentoo.org>
   gnome-utils-2.10.0.ebuild:
diff --git a/gnome-extra/gnome-utils/Manifest b/gnome-extra/gnome-utils/Manifest
index 8d28f1cc90d8..ac126e552e9a 100644
--- a/gnome-extra/gnome-utils/Manifest
+++ b/gnome-extra/gnome-utils/Manifest
@@ -1,21 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 748b2f006fdb437d97f99e4ad6de79f6 ChangeLog 11011
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 443b5f72c9bc7c2782ec5efbedb56ada gnome-utils-2.10.1.ebuild 1189
+MD5 c7b7795deff590f35fda985bc7c1486e ChangeLog 11288
 MD5 62292c35e7929905ad1e54d64faf457f gnome-utils-1.4.1.2.ebuild 1770
-MD5 595511cf320f19db8ed51232f6bd0a5d gnome-utils-2.10.0.ebuild 1188
+MD5 f44d60c5fb8d966cc504de3ab9339bd7 gnome-utils-2.10.1-r1.ebuild 1237
 MD5 4667f33dc876413b4dd989f0d9381bb7 gnome-utils-2.8.1.ebuild 1141
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 595511cf320f19db8ed51232f6bd0a5d gnome-utils-2.10.0.ebuild 1188
+MD5 443b5f72c9bc7c2782ec5efbedb56ada gnome-utils-2.10.1.ebuild 1189
 MD5 5ed644c587beafb4c4a1461bbe322a1d files/digest-gnome-utils-1.4.1.2 72
-MD5 7f6c4dde21c087f0af77c8374ca6da31 files/gnome-utils-2.6.2-gfloppymajor.patch 933
-MD5 caf01bac7da4888355b1c173652d2525 files/digest-gnome-utils-2.10.1 72
+MD5 f72b26ca184501563846835353e2750e files/gnome-utils-2.10.1-gdict_pref.patch 6856
+MD5 caf01bac7da4888355b1c173652d2525 files/digest-gnome-utils-2.10.1-r1 72
 MD5 41af2c6a875d5a02609b98998a2cf614 files/digest-gnome-utils-2.8.1 71
+MD5 7f6c4dde21c087f0af77c8374ca6da31 files/gnome-utils-2.6.2-gfloppymajor.patch 933
 MD5 536b1103c2a53ca7485697352a308809 files/digest-gnome-utils-2.10.0 72
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCxq0vKf2g/qXtneoRAqxJAJ0cpfGldVeQGfBYp03pf4faCQ7YLwCfdNZT
-UXSWwckFLKEruiHswyK4718=
-=AGig
------END PGP SIGNATURE-----
+MD5 caf01bac7da4888355b1c173652d2525 files/digest-gnome-utils-2.10.1 72
diff --git a/gnome-extra/gnome-utils/files/digest-gnome-utils-2.10.1-r1 b/gnome-extra/gnome-utils/files/digest-gnome-utils-2.10.1-r1
new file mode 100644
index 000000000000..43cb6d0c8a90
--- /dev/null
+++ b/gnome-extra/gnome-utils/files/digest-gnome-utils-2.10.1-r1
@@ -0,0 +1 @@
+MD5 78c0afdc112757b13d203fe1ad9c04ad gnome-utils-2.10.1.tar.bz2 2049143
diff --git a/gnome-extra/gnome-utils/files/gnome-utils-2.10.1-gdict_pref.patch b/gnome-extra/gnome-utils/files/gnome-utils-2.10.1-gdict_pref.patch
new file mode 100644
index 000000000000..aad45ac819d2
--- /dev/null
+++ b/gnome-extra/gnome-utils/files/gnome-utils-2.10.1-gdict_pref.patch
@@ -0,0 +1,220 @@
+diff -NurdB gnome-utils-2.10.1/gdictsrc/dict.c gnome-utils-2.10.1-patched/gdictsrc/dict.c
+--- gnome-utils-2.10.1/gdictsrc/dict.c	2005-02-11 11:52:44.000000000 -0500
++++ gnome-utils-2.10.1-patched/gdictsrc/dict.c	2005-07-03 19:32:02.000000000 -0500
+@@ -769,9 +769,16 @@
+     dict_disconnect (context);
+     g_free (context->hostname);
+     context->hostname = NULL;
++
++    if (context->command != NULL) {
++      g_free (context->command);
++    }
++
+     /* FOOOOOOOO, HAAAAAAAAAAACK, the notify handler still gets called,
+      * I do not understand this, this keeps it from dieing */
+     /*g_free (context);*/
++    /* FIXME: Are these hacks still necessary? */
++    g_free (context);
+ }
+ 
+ /* dict_connect (context)
+diff -NurdB gnome-utils-2.10.1/gdictsrc/gdict-app.c gnome-utils-2.10.1-patched/gdictsrc/gdict-app.c
+--- gnome-utils-2.10.1/gdictsrc/gdict-app.c	2005-03-03 12:08:30.000000000 -0500
++++ gnome-utils-2.10.1-patched/gdictsrc/gdict-app.c	2005-07-03 17:40:10.000000000 -0500
+@@ -545,21 +545,20 @@
+   }
+ }
+ 
+-static void
+-gdict_window_close (GtkWidget *widget, GdkEvent *event, gpointer data)
++static gboolean
++gdict_window_delete (GtkWidget *widget, GdkEvent *event, gpointer data)
+ {
+-  GDictWindow *gdict = data;
+-  if (gdict->applet != NULL) 
++  GDictWindow *gdict = (GDictWindow *)data;
++  if (gdict->applet != NULL) {
+     gtk_widget_hide (widget);
+-  else {
+-    gdict_windows = g_slist_remove (gdict_windows, GTK_WINDOW(gdict));    
+-    dict_context_destroy (gdict->context); /* FIXME */
+-    gdict_web_search_remove_all (gdict);
+-    g_slist_free (gdict->web_search_sites);
+-    gtk_widget_destroy (GTK_WIDGET(gdict));        
+-    if (gdict_windows == NULL) 
+-      gtk_main_quit ();
++    return TRUE;
+   }
++ 
++  gdict_windows = g_slist_remove (gdict_windows, GTK_WINDOW(gdict));
++  if (gdict_windows == NULL) 
++    gtk_main_quit ();
++
++  return FALSE;
+ }
+ 
+ GtkWidget *
+@@ -689,7 +688,6 @@
+   GtkWidget *scrolled;
+   GDictSpeller *speller;
+   GtkWidget *window, *main_area;
+-  GtkTooltips *tooltips;
+   GtkToolItem *menu_button;
+   GtkUIManager *ui;
+   GtkWidget *menu;
+@@ -703,8 +701,6 @@
+     { "STRING",     0, 0 }
+   };
+ 
+-  tooltips = gtk_tooltips_new ();
+-
+   window = GTK_WIDGET (gdict);
+ 
+   gtk_window_set_default_size (GTK_WINDOW (window), GDICT_DEFAULT_WIDTH, GDICT_DEFAULT_HEIGHT);
+@@ -816,7 +812,7 @@
+   speller->strat = gdict->pref->dfl_strat;
+ 
+   g_signal_connect (G_OBJECT (window), "delete_event",
+-        G_CALLBACK (gdict_window_close), gdict);
++        G_CALLBACK (gdict_window_delete), gdict);
+ 
+   gdict->speller = speller;
+   gdict->paned = paned;
+@@ -839,7 +835,13 @@
+ static void
+ gdict_window_finalize (GObject *object)
+ {
+-  GDictWindow *window = (GDictWindow *) object;
++  GDictWindow *gdict = (GDictWindow *) object;
++
++  dict_context_destroy (gdict->context); /* FIXME */
++  gdict_web_search_remove_all (gdict);
++  gdict_pref_destroy (gdict->pref);
++  g_slist_free (gdict->web_search_sites);
++
+   parent_class->finalize (object);
+ }
+ 
+diff -NurdB gnome-utils-2.10.1/gdictsrc/gdict-applet.c gnome-utils-2.10.1-patched/gdictsrc/gdict-applet.c
+--- gnome-utils-2.10.1/gdictsrc/gdict-applet.c	2005-03-02 10:25:58.000000000 -0500
++++ gnome-utils-2.10.1-patched/gdictsrc/gdict-applet.c	2005-07-05 14:03:28.000000000 -0500
+@@ -41,8 +41,11 @@
+   gtk_window_move (GTK_WINDOW (gdict), gdict->x, gdict->y);
+   gtk_window_present (GTK_WINDOW (gdict));
+     
+-  if (text==NULL || *text == 0)
++  if (text == NULL || *text == 0) {
++    if (text != NULL)
++      g_free (text);
+     return;
++  }
+ 
+   gtk_editable_delete_text (GTK_EDITABLE (entry), 0, -1);
+   if (gdict->search_type == SEARCH_TYPE_REGULAR)
+@@ -236,6 +239,8 @@
+   gtk_widget_destroy (applet->entry_widget);
+   gtk_widget_destroy (applet->box);
+   gtk_widget_destroy (applet->applet_widget);
++  gtk_widget_destroy (GTK_WIDGET (applet->gdict));
++  g_free (applet);
+ }
+ 
+ static void
+@@ -379,6 +384,7 @@
+ 
+   gdict->applet = applet;
+   applet->gdict = gdict;
++  gdict_pref_load (gdict, gdict->pref);
+ 
+   panel_applet_setup_menu_from_file (PANEL_APPLET (applet->applet_widget),
+                                      NULL, "GNOME_GDictApplet.xml",
+@@ -395,9 +401,6 @@
+                                   NULL);
+   }
+ 
+-  /* server will be contacted when an action is performed */
+-  gdict->context = NULL;
+-  
+   component = panel_applet_get_popup_component (PANEL_APPLET(applet->applet_widget));
+   
+   g_signal_connect (G_OBJECT (applet->applet_widget), "size_allocate",
+diff -NurdB gnome-utils-2.10.1/gdictsrc/gdict-pref.c gnome-utils-2.10.1-patched/gdictsrc/gdict-pref.c
+--- gnome-utils-2.10.1/gdictsrc/gdict-pref.c	2005-04-06 08:29:18.000000000 -0500
++++ gnome-utils-2.10.1-patched/gdictsrc/gdict-pref.c	2005-07-03 17:03:53.000000000 -0500
+@@ -151,6 +151,7 @@
+     full_key = g_strdup_printf (GCONF_PATH, key);
+ 
+   is_writable = gconf_client_key_is_writable (gdict_get_gconf_client (), full_key, NULL);
++  g_free (full_key);
+   return is_writable;
+ }
+ 
+@@ -219,7 +220,7 @@
+  * Loads configuration from config file
+  */
+ 
+-static void 
++void 
+ gdict_pref_load (GDictWindow *gdict, GDictPref *pref)
+ {
+   GError *error = NULL;
+@@ -237,9 +238,13 @@
+ 
+   gdict_add_gconf_notify (gdict, "smart", smart_changed_cb, gdict);
+ 
++  if (pref->database != NULL)
++    g_free (pref->database);
+   pref->database = gdict_get_gconf_string (gdict, "database");
+   gdict_add_gconf_notify (gdict, "database", database_changed_cb, gdict);
+     
++  if (pref->dfl_strat != NULL)
++    g_free (pref->dfl_strat);
+   pref->dfl_strat = gdict_get_gconf_string (gdict, "strategy");
+   gdict_add_gconf_notify (gdict, "strategy", strat_changed_cb, gdict);
+     
+@@ -250,9 +255,9 @@
+   if (!pref->port)
+     pref->port = 2628;
+   if (!pref->database)
+-    pref->database = "!";
++    pref->database = g_strdup ("!");
+   if (!pref->dfl_strat)
+-    pref->dfl_strat = "lev";
++    pref->dfl_strat = g_strdup ("lev");
+ }
+ 
+ GDictPref *
+@@ -266,3 +271,20 @@
+ 
+   return pref;
+ }
++
++void
++gdict_pref_destroy (GDictPref *pref)
++{
++  g_return_if_fail (pref != NULL);
++
++  if (pref->server != NULL)
++    g_free(pref->server);
++
++  if (pref->database != NULL)
++    g_free (pref->database);
++
++  if (pref->dfl_strat != NULL)
++    g_free (pref->dfl_strat);
++
++  g_free (pref);
++}
+diff -NurdB gnome-utils-2.10.1/gdictsrc/gdict-pref.h gnome-utils-2.10.1-patched/gdictsrc/gdict-pref.h
+--- gnome-utils-2.10.1/gdictsrc/gdict-pref.h	2004-12-21 15:13:33.000000000 -0500
++++ gnome-utils-2.10.1-patched/gdictsrc/gdict-pref.h	2005-07-03 16:18:48.000000000 -0500
+@@ -54,6 +54,9 @@
+ GDictPref *gdict_pref_new (gpointer data);
+ GConfClient *gdict_get_gconf_client (void);
+ 
++void gdict_pref_load (GDictWindow *gdict, GDictPref *pref);
++void gdict_pref_destroy (GDictPref *pref);
++
+ gboolean gdict_is_gconf_key_writable (GDictWindow *gdict, gchar *key);
+ 
+ int gdict_get_gconf_int (GDictWindow *gdict, gchar *key);
diff --git a/gnome-extra/gnome-utils/gnome-utils-2.10.1-r1.ebuild b/gnome-extra/gnome-utils/gnome-utils-2.10.1-r1.ebuild
new file mode 100644
index 000000000000..d0a45add5017
--- /dev/null
+++ b/gnome-extra/gnome-utils/gnome-utils-2.10.1-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/gnome-utils-2.10.1-r1.ebuild,v 1.1 2005/07/05 21:04:33 leonardop Exp $
+
+inherit eutils gnome2
+
+DESCRIPTION="Utilities for the Gnome2 desktop"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64 ~sparc ~ppc64 ~ia64 ~hppa"
+IUSE="ipv6 hal"
+
+RDEPEND=">=x11-libs/gtk+-2.6
+	>=gnome-base/libgnome-2.5
+	>=gnome-base/libgnomeui-2.5
+	>=gnome-base/gnome-desktop-2.9.91
+	>=gnome-base/libglade-2.3
+	>=gnome-base/libbonoboui-2.2
+	>=gnome-base/gnome-vfs-2.8.4
+	>=gnome-base/gnome-panel-2.9.4
+	>=gnome-base/libgnomeprint-2.8
+	>=gnome-base/libgnomeprintui-2.8
+	>=gnome-base/gconf-1.2.1
+	sys-fs/e2fsprogs
+	dev-libs/popt
+	hal? ( >=sys-apps/hal-0.4 )"
+
+DEPEND="${RDEPEND}
+	app-text/scrollkeeper
+	>=dev-util/intltool-0.29
+	>=dev-util/pkgconfig-0.12.0"
+
+G2CONF="${G2CONF} $(use_enable ipv6) $(use_enable hal)"
+
+DOCS="AUTHORS ChangeLog NEWS README THANKS"
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+	# fix gfloppy compile problem
+	#epatch ${FILESDIR}/${PN}-2.9-gfloppymajor.patch
+	# may need more work
+	epatch ${FILESDIR}/${P}-gdict_pref.patch
+
+}
+
+USE_DESTDIR="1"