Fix indentation Fix not returning the contact in tp_contact_list_find()

2007-05-19  Xavier Claessens  <xclaesse@gmail.com>

	* libempathy-gtk/Makefile.am:
	* libempathy/empathy-tp-chat.c:
	* libempathy/empathy-contact-manager.c:
	* libempathy/empathy-contact-list.c: Fix indentation
	* libempathy/empathy-tp-contact-list.c: Fix not returning the contact
	in tp_contact_list_find()
	* TODO: Updated.

svn path=/trunk/; revision=75

diff --git a/ChangeLog b/ChangeLog
index b4b18f6bc34ba0e8c67e7b45d8a6b9e0ac63dfa9..88a07a0f6c556c74ace556b2b1c70dc6d302cb91 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2007-05-19  Xavier Claessens  <xclaesse@gmail.com>
+
+       * libempathy-gtk/Makefile.am:
+       * libempathy/empathy-tp-chat.c:
+       * libempathy/empathy-contact-manager.c:
+       * libempathy/empathy-contact-list.c: Fix indentation
+       * libempathy/empathy-tp-contact-list.c: Fix not returning the contact
+       in tp_contact_list_find()
+       * TODO: Updated.
+
 2007-05-19  Xavier Claessens  <xclaesse@gmail.com>
 
        * libempathy-gtk/gossip-contact-list-store.c:

diff --git a/TODO b/TODO
index 9c39a4226c402bc28fac98c71366efa460c6265c..1b78f283dec37061625e3242473fe8b6d487f346 100644 (file)
--- a/TODO
+++ b/TODO
@@ -2,12 +2,12 @@ Things you can do if you want to help:
 
  - Rename all files and functions name to use the empathy namespace.
  - Porting gossip-account-widget-*.{c,h} from gossip project (Guillaume is already working on IRC widget).
- - Make a EmpathyTpChatroom object inherited from EmpathyTpChat and adding support for topic, invite, members list, etc.
  - Porting various UI widgets from gossip to libempathy-gtk for contact info, adding contact, personal info, etc.
  - GtkWidget-ify gossip widgets imported in libempathy-gtk. Actually most window/dialog do not inherit from GtkWindow/GtkDialog...
- - Fix setting subscription for contacts in EmpathyContactList.
- - Write a MC plugin to filter channels before dispatching them. For example we need a GtkStatusIcon that blink when an event arrives (text/voip/ft channel) and tells the MC to dispatch the channel only when the user clicked the icon. Like in gossip.
- - Make use of NetworkManager and gnome-screensaver to set the presence
+ - Fix setting subscription for contacts in EmpathyTpContactList.
+ - Filter channels before dispatching them. For example we need a GtkStatusIcon that blink when an event arrives (text/voip/ft channel) and tells the MC to dispatch the channel only when the user clicked the icon. Like in gossip. For that we need a filter DBus API in MC, not yet written.
+ - Make use of NetworkManager to set the presence
+ - Remove Quit option everywhere, empathy is a session service and shouldn't be leaved.
  - Testing and Bugfixing.
 
 SoC projects:

diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am
index a9ea7a7ca2a57382088fc59497240fa56d1515bb..42fd8b09538b1d7308113e32c4679b18d3f8cb67 100644 (file)
--- a/libempathy-gtk/Makefile.am
+++ b/libempathy-gtk/Makefile.am
@@ -9,8 +9,6 @@ noinst_LTLIBRARIES = libempathy-gtk.la
 libempathy_gtk_la_SOURCES =                                                    \
        ephy-spinner.c                          ephy-spinner.h                  \
        empathy-images.h                                                        \
-       gossip-contact-list-store.c             gossip-contact-list-store.h     \
-       gossip-contact-list-view.c              gossip-contact-list-view.h      \
        empathy-main-window.c                   empathy-main-window.h           \
        empathy-status-icon.c                   empathy-status-icon.h           \
        gossip-accounts-dialog.c                gossip-accounts-dialog.h        \
@@ -21,6 +19,8 @@ libempathy_gtk_la_SOURCES =                                                   \
        gossip-cell-renderer-text.c             gossip-cell-renderer-text.h     \
        gossip-spell.c                          gossip-spell.h                  \
        gossip-contact-groups.c                 gossip-contact-groups.h         \
+       gossip-contact-list-store.c             gossip-contact-list-store.h     \
+       gossip-contact-list-view.c              gossip-contact-list-view.h      \
        gossip-preferences.c                    gossip-preferences.h            \
        gossip-theme-manager.c                  gossip-theme-manager.h          \
        gossip-chat-window.c                    gossip-chat-window.h            \
@@ -50,8 +50,8 @@ glade_DATA =                                  \
        gossip-chat.glade
 
 dtddir = $(datadir)/empathy
-dtd_DATA =                                                                     \
-       gossip-status-presets.dtd                                               \
+dtd_DATA =                                     \
+       gossip-status-presets.dtd               \
        gossip-contact-groups.dtd
 
 

diff --git a/libempathy/empathy-contact-list.c b/libempathy/empathy-contact-list.c
index f763cdb605bbce35c1e3b0b65331b5b473349c1b..b7d02010ba4996d5ecad95aea55a0500ae7e3380 100644 (file)
--- a/libempathy/empathy-contact-list.c
+++ b/libempathy/empathy-contact-list.c
@@ -86,7 +86,7 @@ empathy_contact_list_setup (EmpathyContactList *list)
 
 GossipContact *
 empathy_contact_list_find (EmpathyContactList *list,
-                                const gchar             *id)
+                          const gchar        *id)
 {
        g_return_val_if_fail (EMPATHY_IS_CONTACT_LIST (list), NULL);
 

diff --git a/libempathy/empathy-contact-manager.c b/libempathy/empathy-contact-manager.c
index a4cae35c7f81eda3e93b379221cadf042239bca1..fa62da98fed3642f6ace2308408907fe75589d4b 100644 (file)
--- a/libempathy/empathy-contact-manager.c
+++ b/libempathy/empathy-contact-manager.c
@@ -397,7 +397,7 @@ contact_manager_find_foreach (McAccount              *account,
 {
        data->contact = empathy_contact_list_find (EMPATHY_CONTACT_LIST (list),
                                                   data->id);
-       
+
        if (data->contact) {
                return TRUE;
        }

diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c
index 73f60491ceab8f6d13c552838857d2c3476be360..8e8a52acad2219f5bde44bbde78aba34f4ab6b18 100644 (file)
--- a/libempathy/empathy-tp-chat.c
+++ b/libempathy/empathy-tp-chat.c
@@ -232,7 +232,7 @@ tp_chat_constructor (GType                  type,
        chat = G_OBJECT_CLASS (empathy_tp_chat_parent_class)->constructor (type, n_props, props);
 
        priv = GET_PRIV (chat);
-g_print ("**********tp_chat_constructor");
+
        priv->manager = empathy_contact_manager_new ();
        priv->list = empathy_contact_manager_get_list (priv->manager, priv->account);
        priv->mc = gossip_mission_control_new ();

diff --git a/libempathy/empathy-tp-contact-list.c b/libempathy/empathy-tp-contact-list.c
index 43c317e0035d6f8aeebe999b1be76e7632458892..60a7fd5353a1adcebe10b40ad95c025859ce7f80 100644 (file)
--- a/libempathy/empathy-tp-contact-list.c
+++ b/libempathy/empathy-tp-contact-list.c
@@ -447,17 +447,14 @@ tp_contact_list_find (EmpathyContactList *list,
                      const gchar        *id)
 {
        EmpathyTpContactListPriv *priv;
-       GossipContact            *contact;
 
        g_return_val_if_fail (EMPATHY_IS_TP_CONTACT_LIST (list), NULL);
 
        priv = GET_PRIV (list);
 
-       contact = g_hash_table_find (priv->contacts,
-                                    (GHRFunc) tp_contact_list_find_foreach,
-                                    (gchar*) id);
-
-       return NULL;
+       return g_hash_table_find (priv->contacts,
+                                 (GHRFunc) tp_contact_list_find_foreach,
+                                 (gchar*) id);
 }
 
 static void