[Xfce4-commits] <thunar:master> Give column enums a better name.

[Nick Schermer]

Updating branch refs/heads/master
         to 56842953b63f8435c8a068d5cc444629595efcdd (commit)
       from e238b4ebae2fe05c4eef9fc2acb975a8f0293566 (commit)

commit 56842953b63f8435c8a068d5cc444629595efcdd
Author: Nick Schermer <nick at xfce.org>
Date:   Thu Dec 6 20:27:11 2012 +0100

    Give column enums a better name.

 thunar/thunar-shortcuts-model.c |    8 ++++----
 thunar/thunar-shortcuts-model.h |    4 ++--
 thunar/thunar-shortcuts-view.c  |   12 ++++++------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/thunar/thunar-shortcuts-model.c b/thunar/thunar-shortcuts-model.c
index c1dcfa8..ac099f0 100644
--- a/thunar/thunar-shortcuts-model.c
+++ b/thunar/thunar-shortcuts-model.c
@@ -425,10 +425,10 @@ thunar_shortcuts_model_get_column_type (GtkTreeModel *tree_model,
 {
   switch (idx)
     {
-    case THUNAR_SHORTCUTS_MODEL_COLUMN_HEADER:
+    case THUNAR_SHORTCUTS_MODEL_COLUMN_IS_HEADER:
       return G_TYPE_BOOLEAN;
 
-    case THUNAR_SHORTCUTS_MODEL_COLUMN_ITEM:
+    case THUNAR_SHORTCUTS_MODEL_COLUMN_IS_ITEM:
       return G_TYPE_BOOLEAN;
 
     case THUNAR_SHORTCUTS_MODEL_COLUMN_VISIBLE:
@@ -541,12 +541,12 @@ thunar_shortcuts_model_get_value (GtkTreeModel *tree_model,
 
   switch (column)
     {
-    case THUNAR_SHORTCUTS_MODEL_COLUMN_HEADER:
+    case THUNAR_SHORTCUTS_MODEL_COLUMN_IS_HEADER:
       g_value_init (value, G_TYPE_BOOLEAN);
       g_value_set_boolean (value, (shortcut->group & THUNAR_SHORTCUT_GROUP_HEADER) != 0);
       break;
 
-    case THUNAR_SHORTCUTS_MODEL_COLUMN_ITEM:
+    case THUNAR_SHORTCUTS_MODEL_COLUMN_IS_ITEM:
       g_value_init (value, G_TYPE_BOOLEAN);
       g_value_set_boolean (value, (shortcut->group & THUNAR_SHORTCUT_GROUP_HEADER) == 0);
       break;
diff --git a/thunar/thunar-shortcuts-model.h b/thunar/thunar-shortcuts-model.h
index fce6b68..99bb708 100644
--- a/thunar/thunar-shortcuts-model.h
+++ b/thunar/thunar-shortcuts-model.h
@@ -38,8 +38,8 @@ typedef enum   _ThunarShortcutGroup       ThunarShortcutGroup;
 
 typedef enum
 {
-  THUNAR_SHORTCUTS_MODEL_COLUMN_HEADER,
-  THUNAR_SHORTCUTS_MODEL_COLUMN_ITEM,
+  THUNAR_SHORTCUTS_MODEL_COLUMN_IS_HEADER,
+  THUNAR_SHORTCUTS_MODEL_COLUMN_IS_ITEM,
   THUNAR_SHORTCUTS_MODEL_COLUMN_VISIBLE,
   THUNAR_SHORTCUTS_MODEL_COLUMN_NAME,
   THUNAR_SHORTCUTS_MODEL_COLUMN_TOOLTIP,
diff --git a/thunar/thunar-shortcuts-view.c b/thunar/thunar-shortcuts-view.c
index cfa058f..d690260 100644
--- a/thunar/thunar-shortcuts-view.c
+++ b/thunar/thunar-shortcuts-view.c
@@ -307,7 +307,7 @@ thunar_shortcuts_view_init (ThunarShortcutsView *view)
   gtk_tree_view_column_pack_start (column, renderer, FALSE);
   gtk_tree_view_column_set_attributes (column, renderer,
                                        "text", THUNAR_SHORTCUTS_MODEL_COLUMN_NAME,
-                                       "visible", THUNAR_SHORTCUTS_MODEL_COLUMN_HEADER,
+                                       "visible", THUNAR_SHORTCUTS_MODEL_COLUMN_IS_HEADER,
                                        NULL);
 
   /* separator for indent */
@@ -315,7 +315,7 @@ thunar_shortcuts_view_init (ThunarShortcutsView *view)
   g_object_set (G_OBJECT (renderer), "xpad", 6, NULL);
   gtk_tree_view_column_pack_start (column, renderer, FALSE);
   gtk_tree_view_column_set_attributes (column, renderer,
-                                       "visible", THUNAR_SHORTCUTS_MODEL_COLUMN_ITEM,
+                                       "visible", THUNAR_SHORTCUTS_MODEL_COLUMN_IS_ITEM,
                                        NULL);
 
   /* allocate the special icon renderer */
@@ -325,7 +325,7 @@ thunar_shortcuts_view_init (ThunarShortcutsView *view)
                                        "gicon", THUNAR_SHORTCUTS_MODEL_COLUMN_GICON,
                                        "file", THUNAR_SHORTCUTS_MODEL_COLUMN_FILE,
                                        "device", THUNAR_SHORTCUTS_MODEL_COLUMN_DEVICE,
-                                       "visible", THUNAR_SHORTCUTS_MODEL_COLUMN_ITEM,
+                                       "visible", THUNAR_SHORTCUTS_MODEL_COLUMN_IS_ITEM,
                                        NULL);
 
   /* sync the "emblems" property of the icon renderer with the "shortcuts-icon-emblems" preference
@@ -342,7 +342,7 @@ thunar_shortcuts_view_init (ThunarShortcutsView *view)
   gtk_tree_view_column_pack_start (column, renderer, TRUE);
   gtk_tree_view_column_set_attributes (column, renderer,
                                        "text", THUNAR_SHORTCUTS_MODEL_COLUMN_NAME,
-                                       "visible", THUNAR_SHORTCUTS_MODEL_COLUMN_ITEM,
+                                       "visible", THUNAR_SHORTCUTS_MODEL_COLUMN_IS_ITEM,
                                        NULL);
 
   /* spinner to indicate (un)mount/eject delay */
@@ -921,7 +921,7 @@ thunar_shortcuts_view_selection_func (GtkTreeSelection *selection,
 
   /* don't allow selecting headers */
   gtk_tree_model_get_iter (model, &iter, path);
-  gtk_tree_model_get (model, &iter, THUNAR_SHORTCUTS_MODEL_COLUMN_HEADER, &is_header, -1);
+  gtk_tree_model_get (model, &iter, THUNAR_SHORTCUTS_MODEL_COLUMN_IS_HEADER, &is_header, -1);
   return !is_header;
 }
 
@@ -1057,7 +1057,7 @@ thunar_shortcuts_view_context_menu (ThunarShortcutsView *view,
   GtkTreeModel        *shortcuts_model;
 
   /* check if this is an item menu or a header menu */
-  gtk_tree_model_get (model, iter, THUNAR_SHORTCUTS_MODEL_COLUMN_HEADER, &is_header, -1);
+  gtk_tree_model_get (model, iter, THUNAR_SHORTCUTS_MODEL_COLUMN_IS_HEADER, &is_header, -1);
   if (is_header)
     {
       thunar_shortcuts_view_context_menu_visibility (view, event, model);