[gnome-control-center] wacom: Use symbolic names for columns

[Bastien Nocera <hadess src gnome org>]

commit 69584d5b1766e9cd457453fc9a6b3ceb4f84cf53
Author: Bastien Nocera <hadess hadess net>
Date:   Thu Feb 16 18:48:02 2012 +0100

    wacom: Use symbolic names for columns

 panels/wacom/cc-wacom-mapping-panel.c |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/panels/wacom/cc-wacom-mapping-panel.c b/panels/wacom/cc-wacom-mapping-panel.c
index 5a2af24..7453a73 100644
--- a/panels/wacom/cc-wacom-mapping-panel.c
+++ b/panels/wacom/cc-wacom-mapping-panel.c
@@ -45,6 +45,11 @@ struct _CcWacomMappingPanelPrivate
 	GtkWidget      *checkbutton;
 };
 
+enum {
+	MONITOR_NAME_COLUMN,
+	MONITOR_NUM_COLUMN,
+	MONITOR_NUM_COLUMNS
+};
 
 static GnomeRROutputInfo**
 get_rr_outputs ()
@@ -74,7 +79,7 @@ update_monitor_chooser (CcWacomMappingPanel *self)
 	GdkRectangle geom;
 	gint monitor;
 
-	store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT);
+	store = gtk_list_store_new (MONITOR_NUM_COLUMNS, G_TYPE_STRING, G_TYPE_INT);
 	gtk_combo_box_set_model (GTK_COMBO_BOX(self->priv->combobox), GTK_TREE_MODEL(store));
 
 	if (self->priv->device == NULL)
@@ -104,7 +109,7 @@ update_monitor_chooser (CcWacomMappingPanel *self)
 			gnome_rr_output_info_get_geometry (*outputs, &x, &y, &w, &h);
 			mon_at_point = gdk_screen_get_monitor_at_point (gdk_screen_get_default (), x, y);
 			gtk_list_store_append (store, &iter);
-			gtk_list_store_set (store, &iter, 0, text, 1, mon_at_point, -1);
+			gtk_list_store_set (store, &iter, MONITOR_NAME_COLUMN, text, MONITOR_NUM_COLUMN, mon_at_point, -1);
 
 			if (x == geom.x && y == geom.y && w == geom.width && h == geom.height)
 				gtk_combo_box_set_active_iter (GTK_COMBO_BOX(self->priv->combobox), &iter);
@@ -152,7 +157,7 @@ update_mapping (CcWacomMappingPanel *self)
 			return;
 		}
 
-		gtk_tree_model_get (model, &iter, 0, &name, 1, &monitor, -1);
+		gtk_tree_model_get (model, &iter, MONITOR_NAME_COLUMN, &name, MONITOR_NUM_COLUMN, &monitor, -1);
 	}
 
 	gsd_wacom_device_set_display (self->priv->device, monitor);