Changeset 10994 for branches

Timestamp:

Jul 11, 2010, 6:46:48 AM (12 years ago)

Author:

charles

Message:

(2.0x gtk) #3416 "clicking close on the transmission window causes new "Quit Transmission?" dialog even if one already exists" -- fixed

Location:

branches/2.0x/gtk

Files:

• dialogs.c (modified) (3 diffs)
• dialogs.h (modified) (1 diff)
• main.c (modified) (8 diffs)

branches/2.0x/gtk/dialogs.c

@@ -65 +65 @@
 }
 
-static gboolean
-countActiveTorrents( GtkTreeModel *       model,
-                     GtkTreePath   * path UNUSED,
-                     GtkTreeIter *        iter,
-                     gpointer             activeTorrentCount )
-{
-    int activity = -1;
-    gtk_tree_model_get( model, iter, MC_ACTIVITY, &activity, -1 );
-    if( activity != TR_STATUS_STOPPED )
-        *(int*)activeTorrentCount += 1;
-    return FALSE; /* keep iterating */
-}
-
-void
+GtkWidget *
 askquit( TrCore *       core,
          GtkWindow *    parent,
@@ -88 +75 @@
     GtkWidget *       wind;
     GtkWidget *       dontask;
-    GtkTreeModel *    model;
-    int               activeTorrentCount;
-
-    /* if the user doesn't want to be asked, don't ask */
-    if( !pref_flag_get( PREF_KEY_ASKQUIT ) )
-    {
-        func( cbdata );
-        return;
-    }
-
-    /* if there aren't any active torrents, don't ask */
-    model = tr_core_model( core );
-    activeTorrentCount = 0;
-    gtk_tree_model_foreach( model, countActiveTorrents, &activeTorrentCount );
-    if( !activeTorrentCount )
-    {
-        func( cbdata );
-        return;
-    }
 
     stuff          = g_new( struct quitdata, 1 );
@@ -143 +111 @@
 
     gtk_widget_show_all( wind );
+
+    return wind;
 }
 

branches/2.0x/gtk/dialogs.h

@@ -35 +35 @@
 
 /* prompt if the user wants to quit, calls func with cbdata if they do */
-void askquit( TrCore          * core,
-              GtkWindow       * parent,
-              callbackfunc_t    func,
-              gpointer          cbdata );
+GtkWidget *  askquit( TrCore          * core,
+                      GtkWindow       * parent,
+                      callbackfunc_t    func,
+                      gpointer          cbdata );
 
 void confirmRemove( GtkWindow * parent,

branches/2.0x/gtk/main.c

@@ -85 +85 @@
     GSList            * details;
     GtkTreeSelection  * sel;
+    GtkWidget         * quit_dialog;
 };
 
@@ -282 +283 @@
                          gpointer            user_data )
 {
-    int                  activity = 0;
+    int activity = 0;
     struct counts_data * counts = user_data;
 
@@ -296 +297 @@
 
 static void
+getTorrentCounts( struct cbdata * data, struct counts_data * counts )
+{
+    counts->activeCount = 0;
+    counts->inactiveCount = 0;
+    counts->totalCount = 0;
+
+    gtk_tree_selection_selected_foreach( data->sel, accumulateStatusForeach, counts );
+}
+
+static void
 accumulateCanUpdateForeach( GtkTreeModel *      model,
                             GtkTreePath  * path UNUSED,
@@ -312 +323 @@
     struct counts_data counts;
     struct cbdata * data = gdata;
-    GtkTreeSelection * s = data->sel;
-
-    counts.activeCount = 0;
-    counts.inactiveCount = 0;
-    counts.totalCount = 0;
-    gtk_tree_selection_selected_foreach( s, accumulateStatusForeach, &counts );
+
+    getTorrentCounts( data, &counts );
     action_sensitize( "pause-torrent", counts.activeCount != 0 );
     action_sensitize( "start-torrent", counts.inactiveCount != 0 );
@@ -329 +336 @@
 
     canUpdate = 0;
-    gtk_tree_selection_selected_foreach( s, accumulateCanUpdateForeach, &canUpdate );
+    gtk_tree_selection_selected_foreach( data->sel, accumulateCanUpdateForeach, &canUpdate );
     action_sensitize( "update-tracker", canUpdate != 0 );
 
     {
-        GtkTreeView *  view = gtk_tree_selection_get_tree_view( s );
+        GtkTreeView * view = gtk_tree_selection_get_tree_view( data->sel );
         GtkTreeModel * model = gtk_tree_view_get_model( view );
         const int torrentCount = gtk_tree_model_iter_n_children( model, NULL ) != 0;
@@ -799 +806 @@
 
 static gboolean
+shouldConfirmBeforeExiting( struct cbdata * data )
+{
+    if( !pref_flag_get( PREF_KEY_ASKQUIT ) )
+        return FALSE;
+    else {
+        struct counts_data counts;
+        getTorrentCounts( data, &counts );
+        return counts.activeCount > 0;
+    }
+}
+
+static void
+maybeaskquit( struct cbdata * cbdata )
+{
+    if( !shouldConfirmBeforeExiting( cbdata ) )
+        wannaquit( cbdata );
+    else {
+        if( cbdata->quit_dialog == NULL )
+            cbdata->quit_dialog = askquit( cbdata->core, cbdata->wind, wannaquit, cbdata );
+        gtk_window_present( GTK_WINDOW( cbdata->quit_dialog ) );
+    }
+}
+
+static gboolean
 winclose( GtkWidget * w    UNUSED,
           GdkEvent * event UNUSED,
@@ -808 +839 @@
         action_activate ( "toggle-main-window" );
     else
-        askquit( cbdata->core, cbdata->wind, wannaquit, cbdata );
+        maybeaskquit( cbdata );
 
     return TRUE; /* don't propagate event further */
@@ -1689 +1720 @@
     else if( !strcmp( action_name, "quit" ) )
     {
-        askquit( data->core, data->wind, wannaquit, data );
+        maybeaskquit( data );
     }
     else if( !strcmp( action_name, "select-all" ) )