From c18b77f75ffd4dc97da0f2b8b944e4f5f9f106a5 Mon Sep 17 00:00:00 2001 From: Cosimo Cecchi Date: Tue, 23 Nov 2010 11:39:09 +0100 Subject: [PATCH] media: define an enum for combobox positions --- panels/media/cc-media-panel.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/panels/media/cc-media-panel.c b/panels/media/cc-media-panel.c index 61efbacd5..be9d8a3d3 100644 --- a/panels/media/cc-media-panel.c +++ b/panels/media/cc-media-panel.c @@ -57,6 +57,12 @@ enum { COLUMN_AUTORUN_ITEM_TYPE, }; +enum { + COMBO_ITEM_ASK_OR_LABEL = 0, + COMBO_ITEM_DO_NOTHING, + COMBO_ITEM_OPEN_FOLDER +}; + struct _CcMediaPanelPrivate { GtkBuilder *builder; GSettings *preferences; @@ -629,20 +635,20 @@ prepare_combo_box (CcMediaPanel *self, gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (combo_box), combo_box_separator_func, NULL, NULL); if (num_apps == 0) { - gtk_combo_box_set_active (GTK_COMBO_BOX (combo_box), 0); + gtk_combo_box_set_active (GTK_COMBO_BOX (combo_box), COMBO_ITEM_ASK_OR_LABEL); gtk_widget_set_sensitive (combo_box, FALSE); } else { gtk_widget_set_sensitive (combo_box, TRUE); if (pref_ask) { - gtk_combo_box_set_active (GTK_COMBO_BOX (combo_box), 0); + gtk_combo_box_set_active (GTK_COMBO_BOX (combo_box), COMBO_ITEM_ASK_OR_LABEL); } else if (pref_ignore) { - gtk_combo_box_set_active (GTK_COMBO_BOX (combo_box), 1); + gtk_combo_box_set_active (GTK_COMBO_BOX (combo_box), COMBO_ITEM_DO_NOTHING); } else if (pref_open_folder) { - gtk_combo_box_set_active (GTK_COMBO_BOX (combo_box), 2); + gtk_combo_box_set_active (GTK_COMBO_BOX (combo_box), COMBO_ITEM_OPEN_FOLDER); } else if (set_active != -1) { gtk_combo_box_set_active (GTK_COMBO_BOX (combo_box), set_active); } else { - gtk_combo_box_set_active (GTK_COMBO_BOX (combo_box), 1); + gtk_combo_box_set_active (GTK_COMBO_BOX (combo_box), COMBO_ITEM_DO_NOTHING); } /* See if we have an old data around */