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

[Jean-François Wauthy]

Author: pollux
Date: 2006-08-05 21:40:29 +0000 (Sat, 05 Aug 2006)
New Revision: 22670

Modified:
   xfburn/trunk/xfburn/xfburn-burn-data-composition-dialog.c
   xfburn/trunk/xfburn/xfburn-main.c
   xfburn/trunk/xfburn/xfburn-settings.c
Log:
plug another memleak

Modified: xfburn/trunk/xfburn/xfburn-burn-data-composition-dialog.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-burn-data-composition-dialog.c	2006-08-05 21:08:25 UTC (rev 22669)
+++ xfburn/trunk/xfburn/xfburn-burn-data-composition-dialog.c	2006-08-05 21:40:29 UTC (rev 22670)
@@ -46,6 +46,7 @@
   gchar *command_iso;
   gchar *command_burn;
 
+  GtkWidget *frame_device;
   GtkWidget *combo_device;
   GtkWidget *combo_speed;
   GtkWidget *combo_mode;
@@ -129,10 +130,10 @@
   vbox = gtk_vbox_new (FALSE, 0);
   gtk_widget_show (vbox);
 
-  frame = xfce_create_framebox_with_content (_("Burning device"), vbox);
-  gtk_widget_show (frame);
-  gtk_box_pack_start (box, frame, FALSE, FALSE, BORDER);
-
+  priv->frame_device = xfce_create_framebox_with_content (_("Burning device"), vbox);
+  gtk_widget_show (priv->frame_device);
+  gtk_box_pack_start (box, priv->frame_device, FALSE, FALSE, BORDER);
+    
   priv->combo_device = gtk_combo_box_new_text ();
   gtk_widget_show (priv->combo_device);
   gtk_box_pack_start (GTK_BOX (vbox), priv->combo_device, FALSE, FALSE, BORDER);
@@ -278,6 +279,8 @@
 {
   XfburnBurnDataCompositionDialogPrivate *priv = dialog->priv;
 
+  gtk_widget_set_sensitive (priv->frame_device, !gtk_toggle_button_get_active (button));
+  
   gtk_widget_set_sensitive (priv->hbox_iso, gtk_toggle_button_get_active (button));
   gtk_widget_set_sensitive (priv->check_eject, !gtk_toggle_button_get_active (button));
   gtk_widget_set_sensitive (priv->check_burnfree, !gtk_toggle_button_get_active (button));

Modified: xfburn/trunk/xfburn/xfburn-main.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-main.c	2006-08-05 21:08:25 UTC (rev 22669)
+++ xfburn/trunk/xfburn/xfburn-main.c	2006-08-05 21:40:29 UTC (rev 22670)
@@ -85,7 +85,7 @@
   gtk_widget_show (mainwin);
   
   gtk_main ();
-  
+
 #ifdef HAVE_THUNAR_VFS
   thunar_vfs_shutdown ();
 #endif
@@ -95,5 +95,6 @@
   
   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 21:08:25 UTC (rev 22669)
+++ xfburn/trunk/xfburn/xfburn-settings.c	2006-08-05 21:40:29 UTC (rev 22670)
@@ -143,9 +143,8 @@
 xfburn_settings_internal_init (XfburnSettings *settings)
 {
   XfburnSettingsPrivate *priv = XFBURN_SETTINGS_GET_PRIVATE (settings);
-  gchar *path = NULL;
 
-  priv->settings = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, (GDestroyNotify) value_destroy);
+  priv->settings = g_hash_table_new_full (g_str_hash, g_str_equal, (GDestroyNotify) g_free, (GDestroyNotify) value_destroy);
 
   priv->full_path = xfce_resource_save_location (XFCE_RESOURCE_CONFIG, "xfburn/settings.xml", TRUE);
 }
@@ -323,6 +322,8 @@
 {
   if (val->type == SETTING_TYPE_STRING)
     g_free (val->value.string);
+
+  g_free (val);
 }
 
 static XfburnSettings*
@@ -444,7 +445,7 @@
   setting->type = SETTING_TYPE_BOOL;
   setting->value.integer = value;
 
-  g_hash_table_replace (priv->settings, (gpointer) key, (gpointer) setting);
+  g_hash_table_replace (priv->settings, (gpointer) g_strdup (key), (gpointer) setting);
 }
 
 void
@@ -458,7 +459,7 @@
   setting->type = SETTING_TYPE_INT;
   setting->value.integer = value;
 
-  g_hash_table_replace (priv->settings, (gpointer) key, (gpointer) setting);
+  g_hash_table_replace (priv->settings, (gpointer) g_strdup (key), (gpointer) setting);
 }
 
 void
@@ -472,5 +473,5 @@
   setting->type = SETTING_TYPE_STRING;
   setting->value.string = g_strdup (value);
 
-  g_hash_table_replace (priv->settings, (gpointer) key, (gpointer) setting);
+  g_hash_table_replace (priv->settings, (gpointer) g_strdup (key), (gpointer) setting);
 }