empathy r2333 - trunk/libempathy-gtk

[xclaesse svn gnome org]

Author: xclaesse
Date: Fri Jan 30 17:34:32 2009
New Revision: 2333
URL: http://svn.gnome.org/viewvc/empathy?rev=2333&view=rev

Log:
remove redundant flag

Modified:
   trunk/libempathy-gtk/empathy-contact-selector.c

Modified: trunk/libempathy-gtk/empathy-contact-selector.c
==============================================================================
--- trunk/libempathy-gtk/empathy-contact-selector.c	(original)
+++ trunk/libempathy-gtk/empathy-contact-selector.c	Fri Jan 30 17:34:32 2009
@@ -44,7 +44,6 @@
 typedef struct
 {
   EmpathyContactListStore *store;
-  gboolean is_blank_set;
 } EmpathyContactSelectorPriv;
 
 static void changed_cb (GtkComboBox *widget, gpointer data);
@@ -142,7 +141,6 @@
   g_signal_handlers_block_by_func(selector, changed_cb, NULL);
   gtk_combo_box_set_active_iter (GTK_COMBO_BOX (selector), &blank_iter);
   g_signal_handlers_unblock_by_func(selector, changed_cb, NULL);
-  priv->is_blank_set = TRUE;
 }
 
 
@@ -155,7 +153,6 @@
   if (get_iter_for_blank_contact (GTK_TREE_STORE (priv->store), &blank_iter))
     {
       gtk_tree_store_remove (GTK_TREE_STORE (priv->store), &blank_iter);
-      priv->is_blank_set = FALSE;
     }
 }
 
@@ -164,12 +161,15 @@
 manage_sensitivity (EmpathyContactSelector *selector)
 {
   EmpathyContactSelectorPriv *priv = GET_PRIV (selector);
+
+  /* FIXME - make this work when offline contacts are shown.
+   * The following value needs to be the number of entries shown
+   * excluding the blank entry (if present).
+   */
   guint number_online_contacts =
       get_number_online_contacts (GTK_TREE_STORE (priv->store));
 
-  if (number_online_contacts == 0 && priv->is_blank_set)
-      gtk_widget_set_sensitive (GTK_WIDGET (selector), FALSE);
-  else if (number_online_contacts)
+  if (number_online_contacts)
       gtk_widget_set_sensitive (GTK_WIDGET (selector), TRUE);
   else
       gtk_widget_set_sensitive (GTK_WIDGET (selector), FALSE);