gnome-bluetooth r482 - trunk/common

[hadess svn gnome org]

Author: hadess
Date: Fri Mar 13 14:48:14 2009
New Revision: 482
URL: http://svn.gnome.org/viewvc/gnome-bluetooth?rev=482&view=rev

Log:
Remove code to show the trusted column

It's an implementation detail. (Closes: #574051)



Modified:
   trunk/common/bluetooth-chooser.c
   trunk/common/test-deviceselection.c

Modified: trunk/common/bluetooth-chooser.c
==============================================================================
--- trunk/common/bluetooth-chooser.c	(original)
+++ trunk/common/bluetooth-chooser.c	Fri Mar 13 14:48:14 2009
@@ -55,7 +55,6 @@
 
 	/* Widgets/UI bits that can be shown or hidden */
 	GtkCellRenderer *bonded_cell;
-	GtkCellRenderer *trusted_cell;
 	GtkWidget *treeview;
 	GtkWidget *search_button;
 	GtkWidget *device_type_label, *device_type;
@@ -67,7 +66,6 @@
 	int device_category_filter;
 
 	guint show_paired : 1;
-	guint show_trusted : 1;
 	guint show_search : 1;
 	guint show_device_type : 1;
 	guint show_device_category : 1;
@@ -116,17 +114,6 @@
 }
 
 static void
-trusted_to_icon (GtkTreeViewColumn *column, GtkCellRenderer *cell,
-	      GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
-{
-	gboolean trusted;
-
-	gtk_tree_model_get (model, iter, BLUETOOTH_COLUMN_TRUSTED, &trusted, -1);
-
-	g_object_set (cell, "stock-id", trusted ? GTK_STOCK_ABOUT : NULL, NULL);
-}
-
-static void
 type_to_text (GtkTreeViewColumn *column, GtkCellRenderer *cell,
 	      GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
 {
@@ -498,14 +485,6 @@
 						 bonded_to_icon, NULL, NULL);
 	g_object_set (G_OBJECT (priv->bonded_cell), "visible", priv->show_paired, NULL);
 
-	/* The trusted icon */
-	priv->trusted_cell = gtk_cell_renderer_pixbuf_new ();
-	gtk_tree_view_column_pack_end (column, priv->trusted_cell, FALSE);
-
-	gtk_tree_view_column_set_cell_data_func (column, priv->trusted_cell,
-						 trusted_to_icon, NULL, NULL);
-	g_object_set (G_OBJECT (priv->trusted_cell), "visible", priv->show_trusted, NULL);
-
 	gtk_tree_view_append_column (GTK_TREE_VIEW(tree), column);
 
 	gtk_tree_view_column_set_min_width (GTK_TREE_VIEW_COLUMN(column), 280);
@@ -558,7 +537,6 @@
 	GtkWidget *table;
 
 	priv->show_paired = FALSE;
-	priv->show_trusted = FALSE;
 	priv->show_search = FALSE;
 
 	priv->client = bluetooth_client_new ();
@@ -765,11 +743,6 @@
 		if (priv->bonded_cell != NULL)
 			g_object_set (G_OBJECT (priv->bonded_cell), "visible", priv->show_paired, NULL);
 		break;
-	case PROP_SHOW_TRUSTED:
-		priv->show_trusted = g_value_get_boolean (value);
-		if (priv->trusted_cell)
-			g_object_set (G_OBJECT (priv->trusted_cell), "visible", priv->show_trusted, NULL);
-		break;
 	case PROP_SHOW_SEARCH:
 		priv->show_search = g_value_get_boolean (value);
 		g_object_set (G_OBJECT (priv->search_button), "visible", priv->show_search, NULL);
@@ -829,9 +802,6 @@
 	case PROP_SHOW_PAIRING:
 		g_value_set_boolean (value, priv->show_paired);
 		break;
-	case PROP_SHOW_TRUSTED:
-		g_value_set_boolean (value, priv->show_trusted);
-		break;
 	case PROP_SHOW_SEARCH:
 		g_value_set_boolean (value, priv->show_search);
 		break;
@@ -930,14 +900,6 @@
 					 PROP_SHOW_PAIRING, g_param_spec_boolean ("show-pairing",
 										  NULL, NULL, FALSE, G_PARAM_READWRITE));
 	/**
-	 * BluetoothChooser:show-trusted:
-	 *
-	 * Whether to show the trusted column in the tree.
-	 **/
-	g_object_class_install_property (G_OBJECT_CLASS(klass),
-					 PROP_SHOW_TRUSTED, g_param_spec_boolean ("show-trusted",
-										  NULL, NULL, FALSE, G_PARAM_READWRITE));
-	/**
 	 * BluetoothChooser:show-search:
 	 *
 	 * Whether to show the Search button, this is necessary if you want to programmatically

Modified: trunk/common/test-deviceselection.c
==============================================================================
--- trunk/common/test-deviceselection.c	(original)
+++ trunk/common/test-deviceselection.c	Fri Mar 13 14:48:14 2009
@@ -217,7 +217,6 @@
 		     "show-device-type", FALSE,
 		     "show-device-category", FALSE,
 		     "show-pairing", TRUE,
-		     "show-trusted", TRUE,
 		     "device-category-filter", BLUETOOTH_CATEGORY_PAIRED_OR_TRUSTED,
 		     NULL);