[Xfce4-commits] <midori:master> Don't shadow type variable in katze_property_proxy

[Christian Dywan]

Updating branch refs/heads/master
         to ef67f2539ade340664b3c72a8f25ef981d945411 (commit)
       from 4b912f17deda35127392e304ea6d46b349655e48 (commit)

commit ef67f2539ade340664b3c72a8f25ef981d945411
Author: Christian Dywan <christian at twotoasts.de>
Date:   Thu Oct 22 23:27:58 2009 +0200

    Don't shadow type variable in katze_property_proxy

 katze/katze-utils.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/katze/katze-utils.c b/katze/katze-utils.c
index 7188dbf..fb5da50 100644
--- a/katze/katze-utils.c
+++ b/katze/katze-utils.c
@@ -391,7 +391,7 @@ katze_property_proxy (gpointer     object,
         GtkCellRenderer* renderer;
         GtkComboBox* combo;
         GList* apps;
-        const gchar* type = &hint[12];
+        const gchar* app_type = &hint[12];
 
         model = gtk_list_store_new (3, G_TYPE_APP_INFO, G_TYPE_STRING, G_TYPE_STRING);
         widget = gtk_combo_box_new_with_model (GTK_TREE_MODEL (model));
@@ -402,9 +402,9 @@ katze_property_proxy (gpointer     object,
         gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (widget), renderer, TRUE);
         gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (widget), renderer, "text", 2);
         combo = GTK_COMBO_BOX (widget);
-        apps = g_app_info_get_all_for_type (type);
+        apps = g_app_info_get_all_for_type (app_type);
         if (!apps)
-            apps = katze_app_info_get_all_for_category (type);
+            apps = katze_app_info_get_all_for_category (app_type);
 
         string = katze_object_get_string (object, property);
         if (!g_strcmp0 (string, ""))