rpms/gtkpod/F-10 gtkpod-0.99.12-tooltips.patch, NONE, 1.1 gtkpod.spec, 1.7, 1.8

[Todd M. Zullinger]

Author: tmz

Update of /cvs/pkgs/rpms/gtkpod/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10910/F-10

Modified Files:
	gtkpod.spec 
Added Files:
	gtkpod-0.99.12-tooltips.patch 
Log Message:
Apply upstream fix for disappearing tooltips (#428940)

gtkpod-0.99.12-tooltips.patch:

--- NEW FILE gtkpod-0.99.12-tooltips.patch ---
commit fcda7e67c5e6445186257b53965ccc8a45bce444
Author: Jorg Schuler <jcsjcs at users.sourceforge.net>
Date:   Sat Jan 17 10:54:46 2009 +0000

    	* src/file_convert.c (conversion_log_set_status): don't change tab
    	  label text in conversion log window unless actually
    	  necessary. Fixes the "disappearing tooltips" problem (tracker
    	  #1906016).

diff --git a/src/file_convert.c b/src/file_convert.c
index c17a33f..027e773 100644
--- a/src/file_convert.c
+++ b/src/file_convert.c
@@ -566,19 +566,28 @@ static void conversion_log_set_status (Conversion *conv)
     glthread = conv->threads;
     for (glpage=conv->pages; glpage; glpage=glpage->next)
     {
+	GtkNotebook *notebook = GTK_NOTEBOOK (conv->notebook);
 	GtkWidget *child = glpage->data;
+	const gchar *current_label;
 	g_return_if_fail (child);
 
+	current_label = gtk_notebook_get_tab_label_text (notebook, child);
+
 	/* in the beginning we may have more pages than thread entries */
 	if (glthread && glthread->data)
 	{
-	    gtk_notebook_set_tab_label_text (GTK_NOTEBOOK (conv->notebook),
-					     child, _("active"));
+	    if (!current_label || strcmp (current_label, _("active")) != 0)
+	    {   /* only change the label if it has changed --
+		   otherwise our tooltips will be switched off */
+		gtk_notebook_set_tab_label_text (notebook, child, _("active"));
+	    }
 	}
 	else
 	{
-	    gtk_notebook_set_tab_label_text (GTK_NOTEBOOK (conv->notebook),
-					     child, _("inactive"));
+	    if (!current_label || strcmp (current_label, _("inactive")) != 0)
+	    {
+		gtk_notebook_set_tab_label_text (notebook, child, _("inactive"));
+	    }
 	}
 
 	if (glthread)


Index: gtkpod.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkpod/F-10/gtkpod.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gtkpod.spec	10 Jun 2008 15:44:49 -0000	1.7
+++ gtkpod.spec	19 Jan 2009 03:30:25 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           gtkpod
 Version:        0.99.12
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Graphical song management program for Apple's iPod
 
 Group:          Applications/Multimedia
@@ -9,6 +9,8 @@
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 # https://bugzilla.redhat.com/449199
 Patch0:         gtkpod-0.99.12-use-xdg-open.patch
+# https://bugzilla.redhat.com/428940 (upstream patch)
+Patch1:         gtkpod-0.99.12-tooltips.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  curl-devel
@@ -39,6 +41,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .use-xdg-open
+%patch1 -p1 -b .tooltips
 
 
 %build
@@ -87,6 +90,9 @@
 
 
 %changelog
+* Sun Jan 18 2009 Todd Zullinger <tmz at pobox.com> - 0.99.12-4
+- Apply upstream fix for disappearing tooltips (#428940)
+
 * Tue Jun 10 2008 Todd Zullinger <tmz at pobox.com> - 0.99.12-3
 - use xdg-open as default player (#449199)
   (patch from Debarshi Ray)