soylent r47 - trunk/src

[treitter svn gnome org]

Author: treitter
Date: Sun Jan 13 03:44:17 2008
New Revision: 47
URL: http://svn.gnome.org/viewvc/soylent?rev=47&view=rev

Log:
Trivial naming convention changes

Modified:
   trunk/src/soylent-browser.c

Modified: trunk/src/soylent-browser.c
==============================================================================
--- trunk/src/soylent-browser.c	(original)
+++ trunk/src/soylent-browser.c	Sun Jan 13 03:44:17 2008
@@ -513,7 +513,7 @@
 {
   GList *retval = NULL;
   GladeXML *wtree = NULL;
-  GtkIconView *iconview = NULL;
+  GtkIconView *icon_view = NULL;
   GList *selected_people = NULL;
   GList *l = NULL;
   guint i = 0;
@@ -526,10 +526,10 @@
   wtree = browser->main_window;
   if (wtree && GLADE_IS_XML (wtree))
     {
-      iconview = GTK_ICON_VIEW (glade_xml_get_widget (wtree, "iv_people"));
-      if (iconview)
+      icon_view = GTK_ICON_VIEW (glade_xml_get_widget (wtree, "iv_people"));
+      if (icon_view)
         {
-          selected_people = gtk_icon_view_get_selected_items (iconview);
+          selected_people = gtk_icon_view_get_selected_items (icon_view);
 
           /* TODO: use gtk_icon_view_selected_foreach () */
           for (i = 0, l = selected_people; l != NULL; l = g_list_next (l))
@@ -540,7 +540,7 @@
               gchar *e_uid = NULL;
 
               path = (GtkTreePath *) l->data;
-              model = gtk_icon_view_get_model(iconview);
+              model = gtk_icon_view_get_model(icon_view);
 
               gtk_tree_model_get_iter (model, &iter, path);
               gtk_tree_model_get (model, &iter, PEOPLE_COL_UID, &e_uid, -1);
@@ -634,14 +634,14 @@
   wtree = browser->main_window;
   if (wtree && GLADE_IS_XML (wtree))
     {
-      GtkIconView *iconview = NULL;
+      GtkIconView *icon_view = NULL;
 
-      iconview = GTK_ICON_VIEW (glade_xml_get_widget (wtree, "iv_people"));
-      if (iconview && GTK_IS_ICON_VIEW (iconview))
+      icon_view = GTK_ICON_VIEW (glade_xml_get_widget (wtree, "iv_people"));
+      if (icon_view && GTK_IS_ICON_VIEW (icon_view))
         {
           GList *selected_people = NULL;
 
-          selected_people = gtk_icon_view_get_selected_items (iconview);
+          selected_people = gtk_icon_view_get_selected_items (icon_view);
           if (selected_people)
             {
               GtkTreePath *path = NULL;
@@ -651,7 +651,7 @@
                 {
                   GtkTreeModel *model = NULL;
 
-                  model = gtk_icon_view_get_model (iconview);
+                  model = gtk_icon_view_get_model (icon_view);
                   if (model)
                     {
                       gtk_tree_model_get_iter (model, &iter, path);
@@ -1513,21 +1513,21 @@
 {
   gboolean retval = FALSE;
   GladeXML *wtree = NULL;
-  GtkIconView *iconview = NULL;
-  GtkListStore *liststore = NULL;
+  GtkIconView *icon_view = NULL;
+  GtkListStore *list_store = NULL;
   GtkComboBox *cbox = NULL;
 
   wtree = browser->main_window;
 
-  iconview = GTK_ICON_VIEW (glade_xml_get_widget (wtree, "iv_people"));
-  liststore = gtk_list_store_new (NUM_PEOPLE_COLS, G_TYPE_STRING, G_TYPE_STRING,
-                                  GDK_TYPE_PIXBUF);
-  gtk_icon_view_set_model (iconview, GTK_TREE_MODEL (liststore));
-  gtk_icon_view_set_text_column (iconview, PEOPLE_COL_NAME);
-  gtk_icon_view_set_pixbuf_column (iconview, PEOPLE_COL_PHOTO);
-  gtk_tree_sortable_set_sort_column_id ((GtkTreeSortable*) liststore,
+  icon_view = GTK_ICON_VIEW (glade_xml_get_widget (wtree, "iv_people"));
+  list_store = gtk_list_store_new (NUM_PEOPLE_COLS, G_TYPE_STRING,
+                                   G_TYPE_STRING, GDK_TYPE_PIXBUF);
+  gtk_icon_view_set_model (icon_view, GTK_TREE_MODEL (list_store));
+  gtk_icon_view_set_text_column (icon_view, PEOPLE_COL_NAME);
+  gtk_icon_view_set_pixbuf_column (icon_view, PEOPLE_COL_PHOTO);
+  gtk_tree_sortable_set_sort_column_id ((GtkTreeSortable*) list_store,
                                         PEOPLE_COL_NAME, GTK_SORT_ASCENDING);
-  gtk_tree_sortable_set_sort_func ((GtkTreeSortable*) liststore,
+  gtk_tree_sortable_set_sort_func ((GtkTreeSortable*) list_store,
                                    PEOPLE_COL_NAME,
                                    (GtkTreeIterCompareFunc)
                                     soylent_browser_compare_people_by_icon_iter,