Public feed #887796

Anonymous

public text v1 · immutable
Raw Edit
·published 2008-02-01 16:48 UTC
rendered paste body
Index: client.c
===================================================================
RCS file: /cvsroot/bluez/gnome/common/client.c,v
retrieving revision 1.39
diff -u -p -u -p -r1.39 client.c
--- client.c    1 Feb 2008 12:42:04 -0000       1.39
+++ client.c    1 Feb 2008 16:48:19 -0000
@@ -1361,20 +1361,24 @@ static gboolean adapter_list_filter(GtkT
                                        GtkTreeIter *iter, gpointer data)
 {
        gchar *path;
-       gboolean active;
+       gboolean active, only_active;
 
+       only_active = GPOINTER_TO_INT(data);
        gtk_tree_model_get(model, iter, COLUMN_PATH, &path,
                                        COLUMN_ACTIVE, &active, -1);
 
        if (path == NULL)
                return FALSE;
 
+       if (!only_active)
+               return TRUE;
+
        g_free(path);
 
        return active;
 }
 
-GtkTreeModel *bluetooth_client_get_model_adapter_list(BluetoothClient *client)
+GtkTreeModel *bluetooth_client_get_model_adapter_list(BluetoothClient *client, gboolean only_active)
 {
        BluetoothClientPrivate *priv = BLUETOOTH_CLIENT_GET_PRIVATE(client);
        GtkTreeModel *model;
@@ -1382,7 +1386,7 @@ GtkTreeModel *bluetooth_client_get_model
        model = gtk_tree_model_filter_new(GTK_TREE_MODEL(priv->store), NULL);
 
        gtk_tree_model_filter_set_visible_func(GTK_TREE_MODEL_FILTER(model),
-                                       adapter_list_filter, NULL, NULL);
+                                       adapter_list_filter, GINT_TO_POINTER(only_active), NULL);
 
        return model;
 }
Index: client.h
===================================================================
RCS file: /cvsroot/bluez/gnome/common/client.h,v
retrieving revision 1.21
diff -u -p -u -p -r1.21 client.h
--- client.h    17 Dec 2007 01:09:28 -0000      1.21
+++ client.h    1 Feb 2008 16:48:19 -0000
@@ -110,7 +110,7 @@ gboolean bluetooth_client_cancel_discove
 
 GtkTreeModel *bluetooth_client_get_model(BluetoothClient *self);
 GtkTreeModel *bluetooth_client_get_model_simple(BluetoothClient *self);
-GtkTreeModel *bluetooth_client_get_model_adapter_list(BluetoothClient *self);
+GtkTreeModel *bluetooth_client_get_model_adapter_list(BluetoothClient *self, gboolean only_active);
 GtkTreeModel *bluetooth_client_get_model_for_adapter(BluetoothClient *self,
                                                                gchar *adapter);
 GtkTreeModel *bluetooth_client_get_model_with_filter(BluetoothClient *self,