rpms/gnome-translate/FC-5 gnome-translate-0.99-selected_tag.patch, NONE, 1.1 gnome-translate.spec, 1.7, 1.8

[Dmitry Butskoy (buc)]

Author: buc

Update of /cvs/extras/rpms/gnome-translate/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15339

Modified Files:
	gnome-translate.spec 
Added Files:
	gnome-translate-0.99-selected_tag.patch 
Log Message:


gnome-translate-0.99-selected_tag.patch:

--- NEW FILE gnome-translate-0.99-selected_tag.patch ---
diff -Nrbu gnome-translate-0.99/src/gt-language-view.c gnome-translate-0.99-OK/src/gt-language-view.c
--- gnome-translate-0.99/src/gt-language-view.c	2005-01-28 15:32:05.000000000 +0300
+++ gnome-translate-0.99-OK/src/gt-language-view.c	2006-08-14 19:59:09.000000000 +0400
@@ -109,13 +109,13 @@
   gt_language_view_set_conf_selected_tag(source_view, from);
   g_free(from);
 
-  gtk_tree_view_set_model(dest_view, (GtkTreeModel *) dest_store);
+  to = gt_language_view_get_conf_selected_tag(dest_view);
+  gtk_tree_view_set_model(dest_view, GTK_TREE_MODEL(dest_store));
   if (dest_store)
     g_object_unref(dest_store);
 
   gtk_tree_view_set_search_column(dest_view, COLUMN_NAME);
 
-  to = gt_language_view_get_conf_selected_tag(dest_view);
   gt_language_view_select(dest_view, to);
   g_free(to);
 }
@@ -220,12 +220,12 @@
   gt_g_object_slist_free(pairs);
   g_hash_table_destroy(dest_stores);
 
+  selected_tag = gt_language_view_get_conf_selected_tag(view);
   gtk_tree_view_set_model(view, GTK_TREE_MODEL(source_store));
   g_object_unref(source_store);
 
   gtk_tree_view_set_search_column(view, COLUMN_NAME);
 
-  selected_tag = gt_language_view_get_conf_selected_tag(view);
   gt_language_view_select(view, selected_tag);
   g_free(selected_tag);
 }


Index: gnome-translate.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-translate/FC-5/gnome-translate.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gnome-translate.spec	11 Apr 2006 15:05:30 -0000	1.7
+++ gnome-translate.spec	14 Aug 2006 16:59:04 -0000	1.8
@@ -1,12 +1,13 @@
 Name: gnome-translate
 Summary: GNOME interface to libtranslate -- Natural language translator
 Version: 0.99
-Release: 7%{?dist}
+Release: 8%{?dist}
 Group: User Interface/Desktops
 License: GPL 
 URL: http://www.nongnu.org/libtranslate/gnome-translate
 Source: http://savannah.nongnu.org/download/libtranslate/gnome-translate-%{version}.tar.gz
 Patch0: gnome-translate-0.99-eel2.patch
+Patch1: gnome-translate-0.99-selected_tag.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -39,6 +40,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 
 %build
@@ -74,14 +76,12 @@
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
     gconftool-2 --makefile-uninstall-rule \
       %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || :
-    killall -HUP gconfd-2 || :
 fi
 
 
 %post
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
-killall -HUP gconfd-2 || :
 
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
@@ -96,7 +96,6 @@
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
     gconftool-2 --makefile-uninstall-rule \
       %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
-    killall -HUP gconfd-2 || :
 fi
 
 
@@ -123,7 +122,13 @@
 %{_datadir}/applications/*
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
+
 %changelog
+* Mon Aug 14 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.99-8
+- add patch to properly restore selected languages from
+  the previous invocation (required for recent gtk2 libraries)
+- drop killall -HUP in scripts -- no more needed.
+
 * Tue Apr 11 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.99-7
 - use "export-dynamic" for the linker, as it is recommended
   by upstream (Solves #188491)