Do not take show_groups in empathy_contact_list_store_new

svn path=/trunk/; revision=587

diff --git a/libempathy-gtk/empathy-contact-list-store.c b/libempathy-gtk/empathy-contact-list-store.c
index b430addd8aa1528a7e91581c0c38e22b1cf1b665..bd5e9bc5e95535e9c82abfcf5182d56e9a85cce4 100644 (file)
--- a/libempathy-gtk/empathy-contact-list-store.c
+++ b/libempathy-gtk/empathy-contact-list-store.c
@@ -394,14 +394,12 @@ contact_list_store_set_property (GObject      *object,
 }
 
 EmpathyContactListStore *
 }
 
 EmpathyContactListStore *

-empathy_contact_list_store_new (EmpathyContactList *list_iface,
-                               gboolean            show_groups)
+empathy_contact_list_store_new (EmpathyContactList *list_iface)

 {
        g_return_val_if_fail (EMPATHY_IS_CONTACT_LIST (list_iface), NULL);
 
        return g_object_new (EMPATHY_TYPE_CONTACT_LIST_STORE,
                             "contact-list", list_iface,
 {
        g_return_val_if_fail (EMPATHY_IS_CONTACT_LIST (list_iface), NULL);
 
        return g_object_new (EMPATHY_TYPE_CONTACT_LIST_STORE,
                             "contact-list", list_iface,

-                            "show-groups", show_groups,

                             NULL);
 }
 
                             NULL);
 }
 

diff --git a/libempathy-gtk/empathy-contact-list-store.h b/libempathy-gtk/empathy-contact-list-store.h
index 0dd6e43ac96ecd6c22b33932b8495c29f06969a4..6766a4e978f2553f58c9c3a87ac5472ed680fa81 100644 (file)
--- a/libempathy-gtk/empathy-contact-list-store.h
+++ b/libempathy-gtk/empathy-contact-list-store.h
@@ -73,8 +73,7 @@ struct _EmpathyContactListStoreClass {
 };
 
 GType                      empathy_contact_list_store_get_type           (void) G_GNUC_CONST;
 };
 
 GType                      empathy_contact_list_store_get_type           (void) G_GNUC_CONST;

-EmpathyContactListStore *  empathy_contact_list_store_new                (EmpathyContactList         *list_iface,
-                                                                         gboolean                    show_groups);
+EmpathyContactListStore *  empathy_contact_list_store_new                (EmpathyContactList         *list_iface);

 EmpathyContactList *       empathy_contact_list_store_get_list_iface     (EmpathyContactListStore     *store);
 gboolean                   empathy_contact_list_store_get_show_offline   (EmpathyContactListStore     *store);
 void                       empathy_contact_list_store_set_show_offline   (EmpathyContactListStore     *store,
 EmpathyContactList *       empathy_contact_list_store_get_list_iface     (EmpathyContactListStore     *store);
 gboolean                   empathy_contact_list_store_get_show_offline   (EmpathyContactListStore     *store);
 void                       empathy_contact_list_store_set_show_offline   (EmpathyContactListStore     *store,

diff --git a/libempathy-gtk/empathy-group-chat.c b/libempathy-gtk/empathy-group-chat.c
index 8f361237a7590265a2db1b1ff76a38e2fcde1771..534f66c272534ac2103346c47bf3af1417efb510 100644 (file)
--- a/libempathy-gtk/empathy-group-chat.c
+++ b/libempathy-gtk/empathy-group-chat.c
@@ -526,7 +526,7 @@ group_chat_set_tp_chat (EmpathyChat    *chat,
        }
 
        /* Create contact list */
        }
 
        /* Create contact list */

-       priv->store = empathy_contact_list_store_new (EMPATHY_CONTACT_LIST (priv->tp_chat), TRUE);
+       priv->store = empathy_contact_list_store_new (EMPATHY_CONTACT_LIST (priv->tp_chat));

        priv->view = empathy_contact_list_view_new (priv->store,
                                                    EMPATHY_CONTACT_LIST_FEATURE_CONTACT_CHAT |
                                                    EMPATHY_CONTACT_LIST_FEATURE_CONTACT_CALL |
        priv->view = empathy_contact_list_view_new (priv->store,
                                                    EMPATHY_CONTACT_LIST_FEATURE_CONTACT_CHAT |
                                                    EMPATHY_CONTACT_LIST_FEATURE_CONTACT_CALL |

diff --git a/libempathy-gtk/empathy-main-window.c b/libempathy-gtk/empathy-main-window.c
index 03f11e58c80e32a299e379cab90677da3ea9e2e4..d0353419a6dd27beeef379feac9891648c857068 100644 (file)
--- a/libempathy-gtk/empathy-main-window.c
+++ b/libempathy-gtk/empathy-main-window.c
@@ -284,7 +284,7 @@ empathy_main_window_show (void)
        empathy_status_presets_get_all ();
 
        list_iface = EMPATHY_CONTACT_LIST (empathy_contact_manager_new ());
        empathy_status_presets_get_all ();
 
        list_iface = EMPATHY_CONTACT_LIST (empathy_contact_manager_new ());

-       window->list_store = empathy_contact_list_store_new (list_iface, TRUE);
+       window->list_store = empathy_contact_list_store_new (list_iface);

        window->list_view = empathy_contact_list_view_new (window->list_store,
                                                           EMPATHY_CONTACT_LIST_FEATURE_ALL);
        g_object_unref (list_iface);
        window->list_view = empathy_contact_list_view_new (window->list_store,
                                                           EMPATHY_CONTACT_LIST_FEATURE_ALL);
        g_object_unref (list_iface);

diff --git a/megaphone/src/megaphone-applet.c b/megaphone/src/megaphone-applet.c
index 5c499ac269b858922b6c3be4773a3f756f557326..17ae2c50b508afe6a2ebb9082ab18fe9070d63a7 100644 (file)
--- a/megaphone/src/megaphone-applet.c
+++ b/megaphone/src/megaphone-applet.c
@@ -358,7 +358,7 @@ megaphone_applet_show_preferences (MegaphoneApplet *applet)
 
        /* Show all contacts, even offline and sort alphabetically */
        contact_manager = empathy_contact_manager_new ();
 
        /* Show all contacts, even offline and sort alphabetically */
        contact_manager = empathy_contact_manager_new ();

-       contact_store = empathy_contact_list_store_new (EMPATHY_CONTACT_LIST (contact_manager), TRUE);
+       contact_store = empathy_contact_list_store_new (EMPATHY_CONTACT_LIST (contact_manager));

        g_object_set (contact_store,
                      "is-compact", TRUE,
                      "show-avatars", TRUE,
        g_object_set (contact_store,
                      "is-compact", TRUE,
                      "show-avatars", TRUE,

diff --git a/python/pyempathygtk/pyempathygtk.defs b/python/pyempathygtk/pyempathygtk.defs
index f168800d6d5bdfc37d9237d5206e91ed442c6fcf..4970fe7e93652606d78aabbb4dc4c7498713f04b 100644 (file)
--- a/python/pyempathygtk/pyempathygtk.defs
+++ b/python/pyempathygtk/pyempathygtk.defs
@@ -1052,9 +1052,6 @@
   (of-object "EmpathyContactList")
   (c-name "empathy_contact_list_store_new")
   (return-type "EmpathyContactListStore*")
   (of-object "EmpathyContactList")
   (c-name "empathy_contact_list_store_new")
   (return-type "EmpathyContactListStore*")

-  (parameters
-    '("gboolean" "show_groups")
-  )

 )
 
 (define-method get_list_iface
 )
 
 (define-method get_list_iface