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

info: Remove unused icons

Browse source 
In GNOME 3.2, the icons were hidden. Some changes in GTK+ mean
that the icons are now visible. As we don't use them, remove them
altogether.

https://bugzilla.gnome.org/show_bug.cgi?id=671376
This commit is contained in:
Bastien Nocera 2012-03-05 18:27:18 +00:00
parent 0c464812bb
commit bdb09755c8
1 changed files with 5 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
panels/info/cc-info-panel.c
View file

@ -1247,7 +1247,7 @@ other_type_combo_box_changed (GtkComboBox *combo_box,
} }
gtk_tree_model_get (model, &iter, gtk_tree_model_get (model, &iter,
2, &x_content_type, 1, &x_content_type,
-1); -1);
action_container = GTK_WIDGET (gtk_builder_get_object (self->priv->builder, action_container = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
@ -1356,8 +1356,7 @@ info_panel_setup_media (CcInfoPanel *self)
other_type_combo_box = GTK_WIDGET (gtk_builder_get_object (builder, "media_other_type_combobox")); other_type_combo_box = GTK_WIDGET (gtk_builder_get_object (builder, "media_other_type_combobox"));
other_type_list_store = gtk_list_store_new (3, other_type_list_store = gtk_list_store_new (2,
G_TYPE_ICON,
G_TYPE_STRING, G_TYPE_STRING,
G_TYPE_STRING); G_TYPE_STRING);
@ -1370,7 +1369,6 @@ info_panel_setup_media (CcInfoPanel *self)
for (l = content_types; l != NULL; l = l->next) { for (l = content_types; l != NULL; l = l->next) {
char *content_type = l->data; char *content_type = l->data;
char *description = NULL; char *description = NULL;
GIcon *icon;
if (!g_str_has_prefix (content_type, "x-content/")) if (!g_str_has_prefix (content_type, "x-content/"))
continue; continue;
@ -1399,15 +1397,12 @@ info_panel_setup_media (CcInfoPanel *self)
} }
gtk_list_store_append (other_type_list_store, &iter); gtk_list_store_append (other_type_list_store, &iter);
icon = g_content_type_get_icon (content_type);
gtk_list_store_set (other_type_list_store, &iter, gtk_list_store_set (other_type_list_store, &iter,
0, icon, 0, description,
1, description, 1, content_type,
2, content_type,
-1); -1);
g_free (description); g_free (description);
g_object_unref (icon);
skip: skip:
; ;
} }
@ -1417,16 +1412,10 @@ info_panel_setup_media (CcInfoPanel *self)
gtk_combo_box_set_model (GTK_COMBO_BOX (other_type_combo_box), gtk_combo_box_set_model (GTK_COMBO_BOX (other_type_combo_box),
GTK_TREE_MODEL (other_type_list_store)); GTK_TREE_MODEL (other_type_list_store));
renderer = gtk_cell_renderer_pixbuf_new ();
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (other_type_combo_box), renderer, FALSE);
gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (other_type_combo_box), renderer,
"gicon", 0,
NULL);
renderer = gtk_cell_renderer_text_new (); renderer = gtk_cell_renderer_text_new ();
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (other_type_combo_box), renderer, TRUE); gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (other_type_combo_box), renderer, TRUE);
gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (other_type_combo_box), renderer, gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (other_type_combo_box), renderer,
"text", 1, "text", 0,
NULL); NULL);
g_signal_connect (other_type_combo_box, g_signal_connect (other_type_combo_box,