goobox r351 - in trunk: . src

[paobac svn gnome org]

Author: paobac
Date: Tue Apr 22 11:19:55 2008
New Revision: 351
URL: http://svn.gnome.org/viewvc/goobox?rev=351&view=rev

Log:
2008-04-22  Paolo Bacchilega  <paobac svn gnome org>

	* src/goo-window.c: added some spaces.
	
	* src/goo-player-info.c: use a smaller width for the tray icon tooltip.
	
	* src/dlg-cover-chooser.c: update the cancel button sensitivity after
	stopping the image loading.


Modified:
   trunk/ChangeLog
   trunk/src/dlg-cover-chooser.c
   trunk/src/goo-player-info.c
   trunk/src/goo-window.c

Modified: trunk/src/dlg-cover-chooser.c
==============================================================================
--- trunk/src/dlg-cover-chooser.c	(original)
+++ trunk/src/dlg-cover-chooser.c	Tue Apr 22 11:19:55 2008
@@ -288,6 +288,19 @@
 
 
 static void
+search_completed (DialogData *data)
+{
+	char *text;
+	
+	gtk_widget_set_sensitive (data->cc_cancel_search_button, FALSE);
+	
+	text = g_strdup_printf ("%u", data->urls);
+	gtk_label_set_text (GTK_LABEL (data->progress_label), text);
+	g_free (text);
+}
+
+
+static void
 load_current_url (DialogData *data)
 {
 	char *url, *dest;
@@ -295,8 +308,10 @@
 
 	update_progress_label (data);
 
-	if ((data->current == NULL) || (data->url >= data->max_images))
+	if ((data->current == NULL) || (data->url >= data->max_images)) {
+		search_completed (data);
 		return;
+	}
 
 	url = data->current->data;
 
@@ -609,15 +624,8 @@
 cancel_search_button_clicked_cb (GtkWidget  *widget, 
        				 DialogData *data)
 {
-	char *text;
-	
 	cancel_search (data);
-	
-	text = g_strdup_printf ("%u", data->urls);
-	gtk_label_set_text (GTK_LABEL (data->progress_label), text);
-	g_free (text);
-	
-	gtk_widget_set_sensitive (widget, FALSE);
+	search_completed (data);	
 }
 
 

Modified: trunk/src/goo-player-info.c
==============================================================================
--- trunk/src/goo-player-info.c	(original)
+++ trunk/src/goo-player-info.c	Tue Apr 22 11:19:55 2008
@@ -41,7 +41,7 @@
 #define TRAY_COVER_SIZE 80
 #define MIN_WIDTH 420
 #define MIN_TOOLTIP_WIDTH 300
-#define MAX_TOOLTIP_WIDTH 500
+#define MAX_TOOLTIP_WIDTH 400
 #define MIN_CHARS 45
 #define UPDATE_TIMEOUT 50
 

Modified: trunk/src/goo-window.c
==============================================================================
--- trunk/src/goo-window.c	(original)
+++ trunk/src/goo-window.c	Tue Apr 22 11:19:55 2008
@@ -544,10 +544,12 @@
 			g_source_remove (priv->tray_tooltip_delay);
 			priv->tray_tooltip_delay = 0;
 		}
+		
 		if (priv->next_timeout_handle != 0) {
 			g_source_remove (priv->next_timeout_handle);
 			priv->next_timeout_handle = 0;
 		}
+		
 		if (priv->update_timeout_handle != 0) {
 			g_source_remove (priv->update_timeout_handle);
 			priv->update_timeout_handle = 0;