gucharmap r1806 - trunk/gucharmap

[chpe svn gnome org]

Author: chpe
Date: Sun Jun 15 21:34:49 2008
New Revision: 1806
URL: http://svn.gnome.org/viewvc/gucharmap?rev=1806&view=rev

Log:
Keep the namespace clean.


Modified:
   trunk/gucharmap/gucharmap-chapters-model.c
   trunk/gucharmap/gucharmap-chapters-model.h
   trunk/gucharmap/gucharmap-chapters-view.c
   trunk/gucharmap/gucharmap-script-chapters-model.c

Modified: trunk/gucharmap/gucharmap-chapters-model.c
==============================================================================
--- trunk/gucharmap/gucharmap-chapters-model.c	(original)
+++ trunk/gucharmap/gucharmap-chapters-model.c	Sun Jun 15 21:34:49 2008
@@ -145,7 +145,7 @@
     return FALSE;
 
   do {
-    gtk_tree_model_get(model, &iter, CHAPTERS_ID_COL, &str, -1);
+    gtk_tree_model_get(model, &iter, GUCHARMAP_CHAPTERS_MODEL_COLUMN_ID, &str, -1);
     match = strcmp (id, str);
     g_free(str);
     if (0 == match) {

Modified: trunk/gucharmap/gucharmap-chapters-model.h
==============================================================================
--- trunk/gucharmap/gucharmap-chapters-model.h	(original)
+++ trunk/gucharmap/gucharmap-chapters-model.h	Sun Jun 15 21:34:49 2008
@@ -66,8 +66,8 @@
 
 
 enum {
-  CHAPTERS_ID_COL    = 0,
-  CHAPTERS_LABEL_COL = 1
+  GUCHARMAP_CHAPTERS_MODEL_COLUMN_ID    = 0,
+  GUCHARMAP_CHAPTERS_MODEL_COLUMN_LABEL = 1
 };
 
 GType                    gucharmap_chapters_model_get_type                (void);

Modified: trunk/gucharmap/gucharmap-chapters-view.c
==============================================================================
--- trunk/gucharmap/gucharmap-chapters-view.c	(original)
+++ trunk/gucharmap/gucharmap-chapters-view.c	Sun Jun 15 21:34:49 2008
@@ -61,7 +61,7 @@
   cell = gtk_cell_renderer_text_new ();
   column = priv->column = gtk_tree_view_column_new ();
   gtk_tree_view_column_pack_start (column, cell, FALSE);
-  gtk_tree_view_column_add_attribute (column, cell, "text", CHAPTERS_LABEL_COL);
+  gtk_tree_view_column_add_attribute (column, cell, "text", GUCHARMAP_CHAPTERS_MODEL_COLUMN_LABEL);
   gtk_tree_view_append_column (tree_view, column);
 
   selection = gtk_tree_view_get_selection (tree_view);
@@ -172,7 +172,7 @@
   gchar *name = NULL;
 
   if (gtk_tree_selection_get_selected (selection, &model, &iter))
-    gtk_tree_model_get(model, &iter, CHAPTERS_ID_COL, &name, -1);
+    gtk_tree_model_get(model, &iter, GUCHARMAP_CHAPTERS_MODEL_COLUMN_ID, &name, -1);
 
   return name;
 }

Modified: trunk/gucharmap/gucharmap-script-chapters-model.c
==============================================================================
--- trunk/gucharmap/gucharmap-script-chapters-model.c	(original)
+++ trunk/gucharmap/gucharmap-script-chapters-model.c	Sun Jun 15 21:34:49 2008
@@ -46,14 +46,15 @@
     {
       gtk_list_store_append (store, &iter);
       gtk_list_store_set (store, &iter,
-                          CHAPTERS_ID_COL, unicode_scripts[i],
-                          CHAPTERS_LABEL_COL, _(unicode_scripts[i]),
+                          GUCHARMAP_CHAPTERS_MODEL_COLUMN_ID, unicode_scripts[i],
+                          GUCHARMAP_CHAPTERS_MODEL_COLUMN_LABEL, _(unicode_scripts[i]),
                           -1);
     }
   g_free (unicode_scripts);
 
   gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (model),
-                                        CHAPTERS_LABEL_COL, GTK_SORT_ASCENDING);
+                                        GUCHARMAP_CHAPTERS_MODEL_COLUMN_LABEL,
+                                        GTK_SORT_ASCENDING);
 }
 
 static GucharmapCodepointList *
@@ -64,7 +65,7 @@
   GucharmapCodepointList *list;
   gchar *script_untranslated;
 
-  gtk_tree_model_get (model, iter, CHAPTERS_ID_COL, &script_untranslated, -1);
+  gtk_tree_model_get (model, iter, GUCHARMAP_CHAPTERS_MODEL_COLUMN_ID, &script_untranslated, -1);
 
   list = gucharmap_script_codepoint_list_new ();
   if (!gucharmap_script_codepoint_list_set_script (GUCHARMAP_SCRIPT_CODEPOINT_LIST (list), script_untranslated))
@@ -86,7 +87,7 @@
 {
   gchar *script_untranslated;
 
-  gtk_tree_model_get (model, iter, CHAPTERS_ID_COL, &script_untranslated, -1);
+  gtk_tree_model_get (model, iter, GUCHARMAP_CHAPTERS_MODEL_COLUMN_ID, &script_untranslated, -1);
 
   gucharmap_script_codepoint_list_append_script (list, script_untranslated);