[Xfce4-commits] r22669 - xfburn/trunk/xfburn

[Jean-François Wauthy]

Author: pollux
Date: 2006-08-05 21:08:25 +0000 (Sat, 05 Aug 2006)
New Revision: 22669

Modified:
   xfburn/trunk/xfburn/xfburn-data-composition.c
   xfburn/trunk/xfburn/xfburn-main.c
   xfburn/trunk/xfburn/xfburn-settings.c
   xfburn/trunk/xfburn/xfburn-utils.c
Log:
plug some small memleaks

Modified: xfburn/trunk/xfburn/xfburn-data-composition.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-data-composition.c	2006-08-05 19:26:42 UTC (rev 22668)
+++ xfburn/trunk/xfburn/xfburn-data-composition.c	2006-08-05 21:08:25 UTC (rev 22669)
@@ -993,8 +993,8 @@
       gtk_tree_store_set (GTK_TREE_STORE (model), iter,
                           DATA_COMPOSITION_COLUMN_ICON, icon_directory,
                           DATA_COMPOSITION_COLUMN_CONTENT, name,
-                          DATA_COMPOSITION_COLUMN_PATH, path, DATA_COMPOSITION_COLUMN_TYPE, DATA_COMPOSITION_TYPE_DIRECTORY, 
-			  DATA_COMPOSITION_COLUMN_SIZE, (guint64) 4, -1);
+                          DATA_COMPOSITION_COLUMN_TYPE, DATA_COMPOSITION_TYPE_DIRECTORY, 
+                          DATA_COMPOSITION_COLUMN_SIZE, (guint64) 4, -1);
       xfburn_data_disc_usage_add_size (XFBURN_DISC_USAGE (priv->disc_usage), (guint64) 4);
 
       while ((filename = g_dir_read_name (dir))) {

Modified: xfburn/trunk/xfburn/xfburn-main.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-main.c	2006-08-05 19:26:42 UTC (rev 22668)
+++ xfburn/trunk/xfburn/xfburn-main.c	2006-08-05 21:08:25 UTC (rev 22669)
@@ -93,7 +93,7 @@
   xfburn_settings_flush ();
   xfburn_settings_free ();
   
-  g_list_foreach (list_devices, (GFunc) xfburn_device_content_free, NULL);
+  g_list_foreach (list_devices, (GFunc) xfburn_device_free, NULL);
   g_list_free (list_devices);
   return EXIT_SUCCESS;
 }

Modified: xfburn/trunk/xfburn/xfburn-settings.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-settings.c	2006-08-05 19:26:42 UTC (rev 22668)
+++ xfburn/trunk/xfburn/xfburn-settings.c	2006-08-05 21:08:25 UTC (rev 22669)
@@ -232,15 +232,15 @@
         (k = _find_attribute (attribute_names, "value")) != -1) {
 
       if (!strcmp (attribute_values[j], "int"))
-        xfburn_settings_set_int (g_strdup (attribute_values[i]), atoi (attribute_values[k]));
+        xfburn_settings_set_int (attribute_values[i], atoi (attribute_values[k]));
       else if (!strcmp (attribute_values[j], "boolean")) {
         if (!strcmp (attribute_values[k], "true"))
-          xfburn_settings_set_boolean (g_strdup (attribute_values[i]), TRUE);
+          xfburn_settings_set_boolean (attribute_values[i], TRUE);
         else
-          xfburn_settings_set_boolean (g_strdup (attribute_values[i]), FALSE);
+          xfburn_settings_set_boolean (attribute_values[i], FALSE);
       }
       else if (!strcmp (attribute_values[j], "string"))
-        xfburn_settings_set_string (g_strdup (attribute_values[i]), attribute_values[k]);
+        xfburn_settings_set_string (attribute_values[i], attribute_values[k]);
     }
   }
 }

Modified: xfburn/trunk/xfburn/xfburn-utils.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-utils.c	2006-08-05 19:26:42 UTC (rev 22668)
+++ xfburn/trunk/xfburn/xfburn-utils.c	2006-08-05 21:08:25 UTC (rev 22669)
@@ -123,6 +123,8 @@
           g_message ("Requested device index [%d] is out of bounds. " "All devices have been read.", deviceindex);
           g_hash_table_destroy (ret);
           ret = NULL;
+
+	  g_strfreev (columns);
           break;
         }