Changeset 9528

Timestamp:

Nov 18, 2009, 6:21:01 AM (13 years ago)

Author:

charles

Message:

(trunk gtk) #2587: speed display isn't the same in the main window and in the system tray icon's tooltip

Location:

trunk/gtk

Files:

• main.c (modified) (1 diff)
• tr-icon.c (modified) (6 diffs)
• tr-icon.h (modified) (1 diff)

trunk/gtk/main.c

@@ -1152 +1152 @@
 
         /* update the main window's statusbar and toolbar buttons */
-        if( data->wind )
+        if( data->wind != NULL )
             tr_window_update( data->wind );
 
         /* update the actions */
         refreshActions( data );
+
+        /* update the status tray icon */
+        if( data->icon != NULL )
+            tr_icon_refresh( data->icon );
     }
 

trunk/gtk/tr-icon.c

@@ -25 +25 @@
 }
 
+void
+tr_icon_refresh( gpointer vicon UNUSED )
+{
+}
+
 #else
-
-#define UPDATE_INTERVAL_SECONDS 2
 
 static void
@@ -49 +52 @@
 }
 
-static gboolean
-refresh_tooltip_cb( gpointer data )
+void
+tr_icon_refresh( gpointer vicon )
 {
     double d;
@@ -60 +63 @@
     char tip[1024];
     const char * idle = _( "Idle" );
-    GtkStatusIcon * icon = GTK_STATUS_ICON( data );
+    GtkStatusIcon * icon = GTK_STATUS_ICON( vicon );
     tr_session * session = tr_core_session( g_object_get_data( G_OBJECT( icon ), "tr-core" ) );
 
@@ -104 +107 @@
     gtk_status_icon_set_tooltip( GTK_STATUS_ICON( icon ), tip );
 #endif
-
-    return TRUE;
-}
-
-static void
-closeTag( gpointer tag )
-{
-    g_source_remove( GPOINTER_TO_UINT( tag ) );
 }
 
@@ -117 +112 @@
 tr_icon_new( TrCore * core )
 {
-    guint           id;
     GtkStatusIcon * icon = gtk_status_icon_new_from_icon_name(
         "transmission" );
@@ -123 +117 @@
     g_signal_connect( icon, "activate", G_CALLBACK( activated ), NULL );
     g_signal_connect( icon, "popup-menu", G_CALLBACK( popup ), NULL );
-    id = gtr_timeout_add_seconds( UPDATE_INTERVAL_SECONDS, refresh_tooltip_cb, icon );
     g_object_set_data( G_OBJECT( icon ), "tr-core", core );
-    g_object_set_data_full( G_OBJECT(
-                                icon ), "update-tag", GUINT_TO_POINTER(
-                                id ), closeTag );
     return icon;
 }

trunk/gtk/tr-icon.h

@@ -23 +23 @@
 gpointer tr_icon_new( TrCore * core );
 
+void tr_icon_refresh( gpointer );
+
 #endif