From 6670dd102918f98c25c2cb29ba78fac12f897973 Mon Sep 17 00:00:00 2001
From: Jens Granseuer <jensgr@gmx.net>
Date: Fri, 11 May 2007 22:04:03 +0000
Subject: [PATCH] move some strings to glade file, don't leak the file
 selector, plus a few

2007-05-12  Jens Granseuer  <jensgr@gmx.net>

	* appearance-desktop.c: (get_selected_item),
	(wp_tree_delete_event), (wp_update_preview), (desktop_init):
	* appearance.glade: move some strings to glade file, don't leak the
	file selector, plus a few minor beautifications

svn path=/trunk/; revision=7595
---
 capplets/appearance/ChangeLog            |  7 +++++++
 capplets/appearance/appearance-desktop.c | 25 +++++++-----------------
 capplets/appearance/appearance.glade     | 10 ++++++++--
 3 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/capplets/appearance/ChangeLog b/capplets/appearance/ChangeLog
index 87444789d..2dd80af37 100644
--- a/capplets/appearance/ChangeLog
+++ b/capplets/appearance/ChangeLog
@@ -1,3 +1,10 @@
+2007-05-12  Jens Granseuer  <jensgr@gmx.net>
+
+	* appearance-desktop.c: (get_selected_item),
+	(wp_tree_delete_event), (wp_update_preview), (desktop_init):
+	* appearance.glade: move some strings to glade file, don't leak the
+	file selector, plus a few minor beautifications
+
 2007-05-11  Denis Washington  <denisw@svn.nome.org>
 
 	* appearance-desktop.c: (desktop_init):
diff --git a/capplets/appearance/appearance-desktop.c b/capplets/appearance/appearance-desktop.c
index 4f910df42..a1b9941c7 100644
--- a/capplets/appearance/appearance-desktop.c
+++ b/capplets/appearance/appearance-desktop.c
@@ -58,9 +58,7 @@ static GtkTargetEntry drop_types[] = {
   { "property/bgimage", 0, TARGET_BGIMAGE },
   /*  { "x-special/gnome-reset-background", 0, TARGET_BACKGROUND_RESET }*/
 };
-static GnomeWPItem *
-get_selected_item (AppearanceData *data,
-                   GtkTreeIter *iter);
+
 static void
 scroll_to_item (AppearanceData *data,
                 GnomeWPItem * item)
@@ -96,6 +94,9 @@ get_selected_item (AppearanceData *data,
     gtk_tree_model_get_iter (data->wp_model, &sel_iter,
                              selected->data);
 
+    g_list_foreach (selected, (GFunc) gtk_tree_path_free, NULL);
+    g_list_free (selected);
+
     if (iter)
       *iter = sel_iter;
 
@@ -105,9 +106,6 @@ get_selected_item (AppearanceData *data,
     g_free (wpfile);
   }
 
-  g_list_foreach (selected, (GFunc) gtk_tree_path_free, NULL);
-  g_list_free (selected);
-
   return item;
 }
 
@@ -688,6 +686,8 @@ wp_tree_delete_event (GtkWidget *widget,
 {
   gnome_wp_xml_save_list (data);
   g_object_unref (data->wp_thumbs);
+  g_object_ref_sink (data->wp_filesel);
+  g_object_unref (data->wp_filesel);
 }
 
 static void
@@ -784,6 +784,7 @@ wp_update_preview (GtkFileChooser *chooser,
       pixbuf = gnome_thumbnail_factory_generate_thumbnail (data->wp_thumbs,
                                                            uri,
                                                            mime_type);
+      g_free (mime_type);
     }
 
     if (pixbuf != NULL)
@@ -797,8 +798,6 @@ wp_update_preview (GtkFileChooser *chooser,
                                 "gtk-dialog-question",
                                 GTK_ICON_SIZE_DIALOG);
     }
-
-    g_free (mime_type);
   }
 
   gtk_file_chooser_set_preview_widget_active (chooser, TRUE);
@@ -971,21 +970,11 @@ desktop_init (AppearanceData *data)
 
   data->wp_style_menu = glade_xml_get_widget (data->xml, "wp_style_menu");
 
-  gtk_combo_box_append_text (GTK_COMBO_BOX (data->wp_style_menu), _("Centered"));
-  gtk_combo_box_append_text (GTK_COMBO_BOX (data->wp_style_menu), _("Fill screen"));
-  gtk_combo_box_append_text (GTK_COMBO_BOX (data->wp_style_menu), _("Scaled"));
-  gtk_combo_box_append_text (GTK_COMBO_BOX (data->wp_style_menu), _("Zoom"));
-  gtk_combo_box_append_text (GTK_COMBO_BOX (data->wp_style_menu), _("Tiled"));
-
   g_signal_connect (G_OBJECT (data->wp_style_menu), "changed",
                     G_CALLBACK (wp_scale_type_changed), data);
 
   data->wp_color_menu = glade_xml_get_widget (data->xml, "wp_color_menu");
 
-  gtk_combo_box_append_text (GTK_COMBO_BOX (data->wp_color_menu), _("Solid color"));
-  gtk_combo_box_append_text (GTK_COMBO_BOX (data->wp_color_menu), _("Horizontal gradient"));
-  gtk_combo_box_append_text (GTK_COMBO_BOX (data->wp_color_menu), _("Vertical gradient"));
-
   g_signal_connect (G_OBJECT (data->wp_color_menu), "changed",
                     G_CALLBACK (wp_shade_type_changed), data);
 
diff --git a/capplets/appearance/appearance.glade b/capplets/appearance/appearance.glade
index f3171bdef..ecb825ce0 100644
--- a/capplets/appearance/appearance.glade
+++ b/capplets/appearance/appearance.glade
@@ -1133,7 +1133,11 @@
                             <child>
                               <widget class="GtkComboBox" id="wp_style_menu">
                                 <property name="visible">True</property>
-                                <property name="items" translatable="yes"></property>
+                                <property name="items" translatable="yes">Centered
+Fill screen
+Scaled
+Zoom
+Tiled</property>
                               </widget>
                               <packing>
                                 <property name="expand">False</property>
@@ -1237,7 +1241,9 @@
                     <child>
                       <widget class="GtkComboBox" id="wp_color_menu">
                         <property name="visible">True</property>
-                        <property name="items" translatable="yes"></property>
+                        <property name="items" translatable="yes">Solid color
+Horizontal gradient
+Vertical gradient</property>
                       </widget>
                       <packing>
                         <property name="expand">False</property>