Changeset 6285

Timestamp:

Jul 2, 2008, 6:49:07 PM (14 years ago)

Author:

charles

Message:

(gtk) #1063: don't inhibit power management when torrents are paused

Location:

trunk/gtk

Files:

• tr-core.c (modified) (5 diffs)
• tr-prefs.c (modified) (1 diff)
• tr-prefs.h (modified) (1 diff)

trunk/gtk/tr-core.c

@@ -46 +46 @@
 #include "util.h"
 
-static void tr_core_set_hibernation_allowed( TrCore * core, gboolean allowed );
+static void maybeInhibitHibernation( TrCore * core );
 
 static gboolean our_instance_adds_remote_torrents = FALSE;
@@ -502 +502 @@
     else if( !strcmp( key, PREF_KEY_ALLOW_HIBERNATION ) )
     {
-        tr_core_set_hibernation_allowed( core, pref_flag_get( key ) );
+        maybeInhibitHibernation( core );
     }
 #ifdef HAVE_GIO
@@ -907 +907 @@
     /* resume sorting */
     gtk_tree_sortable_set_sort_column_id( sortable, column, order );
+
+    /* maybe inhibit hibernation */
+    maybeInhibitHibernation( self );
 }
 
@@ -994 +997 @@
 #endif
 
-
-void
+static void
 tr_core_set_hibernation_allowed( TrCore * core, gboolean allowed )
 {
@@ -1017 +1019 @@
 }
 
+static void
+maybeInhibitHibernation( TrCore * core )
+{
+    gboolean allowHibernation;
+    tr_handle * session = tr_core_handle( core );
+
+    /* allow hibernation unless we have active torrents */
+    allowHibernation = TRUE;
+    tr_torrent * tor = NULL;
+    while(( tor = tr_torrentNext( session, tor ))) {
+        if( tr_torrentGetStatus( tor ) != TR_STATUS_STOPPED ) {
+            allowHibernation = FALSE;
+            break;
+        }
+    }
+
+    /* even if we do have active torrents,
+     * maybe allow hibernation anyway... */
+    if( !allowHibernation )
+        allowHibernation = pref_flag_get( PREF_KEY_ALLOW_HIBERNATION );
+
+    tr_core_set_hibernation_allowed( core, allowHibernation );
+}
+
 /**
 ***  Prefs

trunk/gtk/tr-prefs.c

@@ -53 +53 @@
 
     pref_int_set_default    ( PREF_KEY_PEER_SOCKET_TOS, TR_DEFAULT_PEER_SOCKET_TOS );
-    pref_flag_set_default   ( PREF_KEY_ALLOW_HIBERNATION, TRUE );
+    pref_flag_set_default   ( PREF_KEY_ALLOW_HIBERNATION, FALSE );
     pref_flag_set_default   ( PREF_KEY_BLOCKLIST_ENABLED, TR_DEFAULT_BLOCKLIST_ENABLED );
 

trunk/gtk/tr-prefs.h

@@ -28 +28 @@
 #define PREF_KEY_DOWNLOAD_DIR           "download-dir"
 #define PREF_KEY_OPEN_DIALOG_FOLDER     "open-dialog-dir"
-#define PREF_KEY_ALLOW_HIBERNATION      "allow-hibernation"
+#define PREF_KEY_ALLOW_HIBERNATION      "allow-hibernation-even-when-torrents-are-active"
 #define PREF_KEY_DIR_WATCH              "watch-dir"
 #define PREF_KEY_DIR_WATCH_ENABLED      "watch-dir-enabled"