Changeset 7275

Timestamp:

Dec 5, 2008, 3:28:02 PM (12 years ago)

Author:

charles

Message:

(1.3x gtk) backport #1314: gtk+ client crashes in g_markup_escape_text()

File:

• branches/1.3x/gtk/tr-window.c (modified) (6 diffs)

branches/1.3x/gtk/tr-window.c

@@ -72 +72 @@
 typedef struct
 {
-    GtkTooltips * tooltips;
     GtkWidget * scroll;
     GtkWidget * view;
@@ -83 +82 @@
     GtkWidget * stats_lb;
     GtkWidget * gutter_lb;
-    GtkWidget * update_tracker_button;
     GtkTreeSelection  * selection;
     GtkCellRenderer   * renderer;
@@ -227 +225 @@
     gtk_menu_popup( GTK_MENU( p->status_menu ), NULL, NULL, NULL, NULL, 0, gtk_get_current_event_time( ) );
 }
+
+#if GTK_CHECK_VERSION(2,12,0 )
+
+static void
+findMaxAnnounceTime( GtkTreeModel * model,
+                     GtkTreePath  * path UNUSED,
+                     GtkTreeIter  * iter,
+                     gpointer       gmaxTime )
+{
+    tr_torrent *    tor;
+    const tr_stat * torStat;
+    time_t *        maxTime = gmaxTime;
+
+    gtk_tree_model_get( model, iter, MC_TORRENT_RAW, &tor, -1 );
+    torStat = tr_torrentStatCached( tor );
+    *maxTime = MAX( *maxTime, torStat->manualAnnounceTime );
+}
+
+static gboolean
+onAskTrackerQueryTooltip( GtkWidget *            widget UNUSED,
+                          gint                   x UNUSED,
+                          gint                   y UNUSED,
+                          gboolean               keyboard_tip UNUSED,
+                          GtkTooltip *           tooltip,
+                          gpointer               gdata )
+{
+    const time_t now = time( NULL );
+    time_t       maxTime = 0;
+    PrivateData * p = gdata;
+
+    gtk_tree_selection_selected_foreach( p->selection,
+                                         findMaxAnnounceTime,
+                                         &maxTime );
+    if( maxTime <= now )
+    {
+        return FALSE;
+    }
+    else
+    {
+        char      buf[128];
+        char      timebuf[64];
+        const int seconds = maxTime - now;
+
+        tr_strltime( timebuf, seconds, sizeof( timebuf ) );
+        g_snprintf( buf, sizeof( buf ),
+                    _( "Tracker will allow requests in %s" ), timebuf );
+        gtk_tooltip_set_text( tooltip, buf );
+        return TRUE;
+    }
+}
+
+#endif
 
 #define STATS_MODE "stats-mode"
@@ -460 +510 @@
     gtk_box_pack_start( GTK_BOX(vbox), w, FALSE, FALSE, 0 ); 
     w = action_get_widget( "/main-window-menu/torrent-menu/update-tracker" );
-    p->update_tracker_button = w;
+#if GTK_CHECK_VERSION( 2, 12, 0 )
+    g_signal_connect( w, "query-tooltip",
+                      G_CALLBACK( onAskTrackerQueryTooltip ), p );
+#endif
 
     /* toolbar */
@@ -654 +707 @@
 }
 
-static void
-findMaxAnnounceTime( GtkTreeModel * model,
-                     GtkTreePath  * path UNUSED,
-                     GtkTreeIter  * iter,
-                     gpointer       gmaxTime )
-{
-    tr_torrent * tor;
-    const tr_stat * torStat;
-    time_t * maxTime = gmaxTime;
-
-    gtk_tree_model_get( model, iter, MC_TORRENT_RAW, &tor, -1 );
-    torStat = tr_torrentStatCached( tor );
-    *maxTime = MAX( *maxTime, torStat->manualAnnounceTime );
-}
-
-static void
-updateAskForPeers( PrivateData * p )
-{
-    char buf[128];
-    time_t maxTime = 0;
-    const time_t now = time( NULL );
-
-    gtk_tree_selection_selected_foreach( p->selection,
-                                         findMaxAnnounceTime,
-                                         &maxTime );
-
-    if( maxTime <= now )
-        *buf = '\0';
-    else {
-        char secbuf[32];
-        const int seconds = maxTime - time( NULL );
-        tr_strltime( secbuf, seconds, sizeof( secbuf ) );
-        g_snprintf( buf, sizeof( buf ), _( "Tracker will allow requests in %s" ), secbuf );
-    }
-
-    if( !p->tooltips )
-        p->tooltips = gtk_tooltips_new( );
-    gtk_tooltips_set_tip( p->tooltips, p->update_tracker_button, buf, NULL );
-}
-
 void
 tr_window_update( TrWindow * self )
@@ -703 +716 @@
         updateTorrentCount( p );
         updateStats( p );
-        updateAskForPeers( p );
         refilter( p );
     }