Changeset 4244

Timestamp:

Dec 20, 2007, 3:16:14 PM (14 years ago)

Author:

charles

Message:

(gtk) fix three memory leaks + minor cleanup in the torrent renderer

Location:

trunk/gtk

Files:

• actions.c (modified) (1 diff)
• torrent-cell-renderer.c (modified) (20 diffs)

trunk/gtk/actions.c

@@ -275 +275 @@
   gtk_ui_manager_insert_action_group( ui_manager, action_group, 0 );
   g_object_unref (G_OBJECT(action_group));
+  g_free( match );
 }
 

trunk/gtk/torrent-cell-renderer.c

@@ -68 +68 @@
 getProgressString( const tr_info * info, const tr_stat * torStat )
 {
-    const int allDownloaded = torStat->leftUntilDone == 0;
+    const int isDone = torStat->leftUntilDone == 0;
     const uint64_t haveTotal = torStat->haveUnchecked + torStat->haveValid;
     const int isSeed = torStat->haveValid >= info->totalSize;
@@ -74 +74 @@
     char * str;
 
-    if( !allDownloaded )
+    if( !isDone )
         str = g_strdup_printf(
                   _("%s of %s (%.2f%%)"),
@@ -101 +101 @@
 getShortTransferString( const tr_stat * torStat, char * buf, size_t buflen )
 {
-    char upStr[32], downStr[32];
+    char downStr[32], upStr[32];
+    const int haveDown = ( torStat->rateDownload * 1024 ) > 1.0;
     const int haveUp = ( torStat->rateUpload * 1024 ) > 1.0;
-    const int haveDown = ( torStat->rateDownload * 1024 ) > 1.0;
 
     if( haveDown )
@@ -146 +146 @@
             char buf[128];
             if( torStat->status != TR_STATUS_DOWNLOAD )
-                g_string_append_printf( gstr, _("Ratio: %.1f, " ), torStat->ratio*100.0 );
-            g_string_append( gstr, getShortTransferString( torStat, buf, sizeof( buf ) ) );
+                g_string_append_printf( gstr, _("Ratio: %.1f, " ),
+                                        torStat->ratio*100.0 );
+            getShortTransferString( torStat, buf, sizeof( buf ) );
+            g_string_append( gstr, buf );
             break;
         }
@@ -161 +163 @@
 getStatusString( const tr_stat * torStat )
 {
-    char * pch;
     const int isActive = torStat->status != TR_STATUS_STOPPED;
     const int isChecking = torStat->status == TR_STATUS_CHECK
@@ -176 +177 @@
         case TR_STATUS_STOPPED:
         case TR_STATUS_CHECK_WAIT:
-        case TR_STATUS_CHECK:
-            pch = getShortStatusString( torStat );
+        case TR_STATUS_CHECK: {
+            char * pch = getShortStatusString( torStat );
             g_string_assign( gstr, pch );
             g_free( pch );
             break;
+        }
 
         case TR_STATUS_DOWNLOAD:
@@ -377 +379 @@
     const double unverified = torStat->haveUnchecked / (double)info->totalSize;
     const double unavailable = ( torStat->desiredSize
-                               - torStat->desiredAvailable ) / (double)info->totalSize;
+                       - torStat->desiredAvailable ) / (double)info->totalSize;
     const double unwanted = ( info->totalSize
                             - torStat->desiredSize ) / (double)info->totalSize;
@@ -443 +445 @@
     if(( w = unavailableWidth )) {
         const GdkColor * colors = isActive && self->priv->show_unavailable
-            ? self->priv->color_unavailable
-            : self->priv->color_missing;
+                                ? self->priv->color_unavailable
+                                : self->priv->color_missing;
         rect.x = x;
         rect.width = w;
@@ -490 +492 @@
         const char * name = info->name;
         const tr_stat * torStat = tr_torrentStat( (tr_torrent*)tor );
-        char * progressString = getProgressString( info, torStat );
-        char * statusString = getStatusString( torStat );
-        char * str;
         GdkRectangle my_bg;
         GdkRectangle my_cell;
@@ -510 +509 @@
         if( !p->minimal )
         {
-            str = g_markup_printf_escaped( "<b>%s</b>\n<small>%s</small>",
-                                           name, progressString );
+            char * progressString = getProgressString( info, torStat );
+            char * str = g_markup_printf_escaped( "<b>%s</b>\n<small>%s</small>",
+                                                  name, progressString );
             g_object_set( p->text_renderer, "markup", str,
                                             "ellipsize", PANGO_ELLIPSIZE_NONE,
@@ -528 +528 @@
             my_cell.y += h;
             my_expose.y += h;
+
+            g_free( str );
+            g_free( progressString );
         }
         else
         {
+            char * statusStr = getShortStatusString( torStat );
+            char * str = g_markup_printf_escaped( "<small>%s</small>", statusStr );
             int w1, w2, h1, h2, tmp_h;
-            char * shortStatus = getShortStatusString( torStat );
             GdkRectangle tmp_bg, tmp_cell, tmp_expose;
 
@@ -543 +547 @@
 
             /* get the dimensions for the short status string */
-            str = g_markup_printf_escaped( "<small>%s</small>", shortStatus );
             g_object_set( p->text_renderer, "markup", str,
                                             "ellipsize", PANGO_ELLIPSIZE_NONE,
@@ -559 +562 @@
             tmp_expose = tmp_cell = tmp_bg;
             g_object_set( p->text_renderer, "markup", str,
-                                            "ellipsize", PANGO_ELLIPSIZE_NONE,
+                                            "ellipsize", PANGO_ELLIPSIZE_END,
                                             NULL );
             gtk_cell_renderer_render( p->text_renderer,
@@ -576 +579 @@
                                       &tmp_bg, &tmp_cell, &tmp_expose, flags );
 
-            g_free( str );
-            g_free( shortStatus );
-
             my_bg.y = tmp_bg.y + tmp_bg.height;
             my_cell.y = tmp_cell.y + tmp_cell.height;
             my_expose.y += tmp_expose.y + tmp_cell.height;
+
+            g_free( str );
+            g_free( statusStr );
         }
 
@@ -594 +597 @@
         if( !p->minimal )
         {
-            str = g_markup_printf_escaped( "<small>%s</small>", statusString );
+            char * statusString = getStatusString( torStat );
+            char * str = g_markup_printf_escaped( "<small>%s</small>",
+                                                  statusString );
             g_object_set( p->text_renderer, "markup", str,
                                             "ellipsize", PANGO_ELLIPSIZE_END,
@@ -606 +611 @@
                                       window, widget,
                                       &my_bg, &my_cell, &my_expose, flags );
-        }
-
-        g_free( statusString );
-        g_free( progressString );
+
+            g_free( str );
+            g_free( statusString );
+        }
     }
 }
@@ -630 +635 @@
     switch( property_id )
     {
-        case P_TORRENT:     p->tor = g_value_get_pointer( v ); break;
-        case P_BAR_HEIGHT:  p->bar_height = g_value_get_int( v ); break;
-        case P_MINIMAL:     p->minimal  = g_value_get_boolean( v ); break;
-        case P_GRADIENT:    p->gradient = g_value_get_boolean( v ); break;
-        case P_SHOW_UNAVAILABLE:    p->show_unavailable = g_value_get_boolean( v ); break;
         case P_COLOR_MISSING:       v2c( &p->color_missing[0],     v ); break;
         case P_COLOR_MISSING_2:     v2c( &p->color_missing[1],     v ); break;
@@ -649 +649 @@
         case P_COLOR_SEEDING:       v2c( &p->color_seeding[0],     v ); break;
         case P_COLOR_SEEDING_2:     v2c( &p->color_seeding[1],     v ); break;
-        default: G_OBJECT_WARN_INVALID_PROPERTY_ID( object, property_id, pspec ); break;
+        case P_TORRENT:     p->tor = g_value_get_pointer( v ); break;
+        case P_BAR_HEIGHT:  p->bar_height = g_value_get_int( v ); break;
+        case P_MINIMAL:     p->minimal  = g_value_get_boolean( v ); break;
+        case P_GRADIENT:    p->gradient = g_value_get_boolean( v ); break;
+        case P_SHOW_UNAVAILABLE:
+                            p->show_unavailable = g_value_get_boolean( v ); break;
+        default:
+            G_OBJECT_WARN_INVALID_PROPERTY_ID( object, property_id, pspec );
+            break;
     }
 }
@@ -675 +683 @@
     switch( property_id )
     {
-        case P_TORRENT:     g_value_set_pointer( v, p->tor ); break;
-        case P_BAR_HEIGHT:  g_value_set_int( v, p->bar_height ); break;
-        case P_MINIMAL:     g_value_set_boolean( v, p->minimal ); break;
-        case P_GRADIENT:    g_value_set_boolean( v, p->gradient ); break;
-        case P_SHOW_UNAVAILABLE:    g_value_set_boolean( v, p->show_unavailable ); break;
         case P_COLOR_MISSING:       c2v( v, &p->color_missing[0] ); break;
         case P_COLOR_MISSING_2:     c2v( v, &p->color_missing[1] ); break;
@@ -694 +697 @@
         case P_COLOR_SEEDING:       c2v( v, &p->color_seeding[0] ); break;
         case P_COLOR_SEEDING_2:     c2v( v, &p->color_seeding[1] ); break;
+        case P_TORRENT:     g_value_set_pointer( v, p->tor ); break;
+        case P_BAR_HEIGHT:  g_value_set_int( v, p->bar_height ); break;
+        case P_MINIMAL:     g_value_set_boolean( v, p->minimal ); break;
+        case P_GRADIENT:    g_value_set_boolean( v, p->gradient ); break;
+        case P_SHOW_UNAVAILABLE:
+                            g_value_set_boolean( v, p->show_unavailable ); break;
         default:
             G_OBJECT_WARN_INVALID_PROPERTY_ID( object, property_id, pspec );