X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=sla-list.cc;h=3b3a5c9d4eedd11683f6ca1cc9fc1199f59ac536;hb=da1232179564424dfa09852cb52471c600a49967;hp=c89ab925c59030d40144e7f9eaca6c7deb8d7ba9;hpb=33e977b857b61e6125ebe8e45a0aa71fb658f676;p=simple-launcher

diff --git a/sla-list.cc b/sla-list.cc
index c89ab92..3b3a5c9 100644
--- a/sla-list.cc
+++ b/sla-list.cc
@@ -28,9 +28,9 @@
 #include "sla-list.h"
 
 enum {
-  SLA_LIST_COLUMN_ICON = 0,
-  SLA_LIST_COLUMN_INDEX,
-  SLA_LIST_COLUMN_LAST
+  SLA_STORE_COLUMN_ICON = 0,
+  SLA_STORE_COLUMN_INDEX,
+  SLA_STORE_COLUMN_LAST
 };
 
 static GtkWidget *gtk_button_new_stock_image_only(const gchar *stock_id) {
@@ -110,7 +110,7 @@ SLAList::SLAList(int icon_size, LauncherItems& items): myWidget(NULL), myStore(N
     GtkTreeIter iter;
 
     gtk_list_store_append(myStore, &iter);
-    gtk_list_store_set(myStore, &iter, 0, item->getIcon(icon_size), 1, it-myItems.myNames.begin(), -1);
+    gtk_list_store_set(myStore, &iter, SLA_STORE_COLUMN_ICON, item->getIcon(icon_size), SLA_STORE_COLUMN_INDEX, it-myItems.myNames.begin(), -1);
   }
 }
 
@@ -170,7 +170,7 @@ void SLAList::_moveDown(GtkButton *button, void *self) {
 void SLAList::renderText(GtkTreeViewColumn *, GtkCellRenderer *cell, GtkTreeModel *model, GtkTreeIter *iter) {
   int index;
 
-  gtk_tree_model_get(GTK_TREE_MODEL(myStore), iter, SLA_LIST_COLUMN_INDEX, &index, -1);
+  gtk_tree_model_get(GTK_TREE_MODEL(myStore), iter, SLA_STORE_COLUMN_INDEX, &index, -1);
 
   LauncherItem *item = myItems[index];
 
@@ -186,7 +186,7 @@ void SLAList::renderText(GtkTreeViewColumn *, GtkCellRenderer *cell, GtkTreeMode
 void SLAList::renderBool(GtkTreeViewColumn *, GtkCellRenderer *cell, GtkTreeModel *model, GtkTreeIter *iter) {
   int index;
 
-  gtk_tree_model_get(GTK_TREE_MODEL(myStore), iter, SLA_LIST_COLUMN_INDEX, &index, -1);
+  gtk_tree_model_get(GTK_TREE_MODEL(myStore), iter, SLA_STORE_COLUMN_INDEX, &index, -1);
 
   g_object_set(cell, "active", myItems[index]->isEnabled(), NULL);
 }
@@ -197,7 +197,7 @@ void SLAList::toggleBool(GtkCellRendererToggle *renderer, const gchar *spath) {
   if (gtk_tree_model_get_iter_from_string(GTK_TREE_MODEL(myStore), &iter, spath)) {
     int index;
 
-    gtk_tree_model_get(GTK_TREE_MODEL(myStore), &iter, SLA_LIST_COLUMN_INDEX, &index, -1);
+    gtk_tree_model_get(GTK_TREE_MODEL(myStore), &iter, SLA_STORE_COLUMN_INDEX, &index, -1);
     myItems[index]->toggle();
   }
 }
@@ -244,13 +244,13 @@ void SLAList::moveDown(GtkButton *) {
 void SLAList::swap(GtkTreeIter& a, GtkTreeIter& b) {
   int i1, i2;
 
-  gtk_tree_model_get(GTK_TREE_MODEL(myStore), &a, SLA_LIST_COLUMN_INDEX, &i1, -1);
-  gtk_tree_model_get(GTK_TREE_MODEL(myStore), &b, SLA_LIST_COLUMN_INDEX, &i2, -1);
+  gtk_tree_model_get(GTK_TREE_MODEL(myStore), &a, SLA_STORE_COLUMN_INDEX, &i1, -1);
+  gtk_tree_model_get(GTK_TREE_MODEL(myStore), &b, SLA_STORE_COLUMN_INDEX, &i2, -1);
 
   myItems.swap(i1, i2);
 
-  gtk_list_store_set(myStore, &a, SLA_LIST_COLUMN_INDEX, i2, -1);
-  gtk_list_store_set(myStore, &b, SLA_LIST_COLUMN_INDEX, i1, -1);
+  gtk_list_store_set(myStore, &a, SLA_STORE_COLUMN_INDEX, i2, -1);
+  gtk_list_store_set(myStore, &b, SLA_STORE_COLUMN_INDEX, i1, -1);
 
   gtk_list_store_swap(myStore, &a, &b);
 }