applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove some unnecessary code.

Browse source 
2007-05-07  Thomas Wood  <thos@gnome.org>

	* appearance-style.c: (conv_to_widget_cb), (prepare_combo): Remove some
	unnecessary code.

svn path=/trunk/; revision=7574
This commit is contained in:
Thomas Wood 2007-05-07 22:29:37 +00:00 • committed by Thomas Wood
parent 8ae230b9ae
commit b0ea25cd5c
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
capplets/appearance/ChangeLog
View file

@ -1,3 +1,8 @@
2007-05-07 Thomas Wood <thos@gnome.org>
* appearance-style.c: (conv_to_widget_cb), (prepare_combo): Remove some
unnecessary code.
2007-05-07 Thomas Wood <thos@gnome.org>
* appearance-style.c: (prepare_combo): Fix icon theme combo box

8
capplets/appearance/appearance-style.c
View file

@ -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,