From b0ea25cd5ccb2a2c9b2c3f4c2118f3cff7af92d9 Mon Sep 17 00:00:00 2001 From: Thomas Wood Date: Mon, 7 May 2007 22:29:37 +0000 Subject: [PATCH] Remove some unnecessary code. 2007-05-07 Thomas Wood * appearance-style.c: (conv_to_widget_cb), (prepare_combo): Remove some unnecessary code. svn path=/trunk/; revision=7574 --- capplets/appearance/ChangeLog | 5 +++++ capplets/appearance/appearance-style.c | 8 ++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/capplets/appearance/ChangeLog b/capplets/appearance/ChangeLog index a68de2df9..3d53c3d7f 100644 --- a/capplets/appearance/ChangeLog +++ b/capplets/appearance/ChangeLog @@ -1,3 +1,8 @@ +2007-05-07 Thomas Wood + + * appearance-style.c: (conv_to_widget_cb), (prepare_combo): Remove some + unnecessary code. + 2007-05-07 Thomas Wood * appearance-style.c: (prepare_combo): Fix icon theme combo box diff --git a/capplets/appearance/appearance-style.c b/capplets/appearance/appearance-style.c index cc51f9c2c..b5252d4b7 100644 --- a/capplets/appearance/appearance-style.c +++ b/capplets/appearance/appearance-style.c @@ -64,6 +64,8 @@ conv_to_widget_cb (GConfPropertyEditor *peditor, GConfValue *value) } g_free (test); + /* FIXME: Add a temporary item if we can't find a match */ + new_value = gconf_value_new (GCONF_VALUE_INT); gconf_value_set_int (new_value, index); @@ -98,8 +100,6 @@ prepare_combo (AppearanceData *data, GtkWidget *combo, enum ThemeType type) GList *l, *list = NULL; GtkCellRenderer *renderer; GnomeThemeElement element = 0; - gchar *value = NULL; - GtkTreeIter active_row; switch (type) { @@ -122,7 +122,6 @@ prepare_combo (AppearanceData *data, GtkWidget *combo, enum ThemeType type) renderer = gtk_cell_renderer_text_new (); store = gtk_list_store_new (1, G_TYPE_STRING); - value = gconf_client_get_string (data->client, gconf_keys[type], NULL); for (l = list; l; l = g_list_next (l)) { @@ -139,14 +138,11 @@ prepare_combo (AppearanceData *data, GtkWidget *combo, enum ThemeType type) gtk_list_store_insert_with_values (store, &i, 0, 0, name, -1); - if (value && !strcmp (value, name)) - active_row = i; } gtk_combo_box_set_model (GTK_COMBO_BOX (combo), GTK_TREE_MODEL (store)); gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, TRUE); gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (combo), renderer, "text", 0); - gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combo), &active_row); gconf_peditor_new_combo_box (NULL, gconf_keys[type], combo, "conv-to-widget-cb", conv_to_widget_cb,