← Back to branch summary

~ubuntu-branches/ubuntu/maverick/empathy/maverick-201208312044

« back to all changes in this revision

Viewing changes to libempathy/empathy-tp-contact-factory.c

  • Committer: Bazaar Package Importer
  • Author(s): Laurent Bigonville
  • Date: 2009-03-11 01:28:38 UTC
  • mfrom: (1.2.2 upstream)
  • mto: (6.4.1 sid) (1.6.2 upstream)
  • mto: This revision was merged to the branch mainline in revision 48.
  • Revision ID: james.westby@ubuntu.com-20090311012838-tlho02vbsl8p0v9i
Tags: upstream-2.25.92
Import upstream version 2.25.92

Show diffs side-by-side

added added

removed removed

Lines of Context:
libempathy/empathy-tp-contact-factory.c
130
130
                message_str = g_value_get_string (message);
131
131
        }
132
132
 
133
 
        if (!G_STR_EMPTY (message_str)) {
 
133
        if (!EMP_STR_EMPTY (message_str)) {
134
134
                empathy_contact_set_presence_message (contact, message_str);
135
135
        } else {
136
136
                empathy_contact_set_presence_message (contact, NULL);
384
384
        }
385
385
 
386
386
        /* Check if we have an avatar */
387
 
        if (G_STR_EMPTY (token)) {
 
387
        if (EMP_STR_EMPTY (token)) {
388
388
                empathy_contact_set_avatar (contact, NULL);
389
389
                return TRUE;
390
390
        }
783
783
                handle = empathy_contact_get_handle (contact);
784
784
                id = empathy_contact_get_id (contact);
785
785
                if (handle == 0) {
786
 
                        g_assert (!G_STR_EMPTY (id));
 
786
                        g_assert (!EMP_STR_EMPTY (id));
787
787
                        g_array_append_val (handle_needed, id);
788
788
                        handle_needed_contacts = g_list_prepend (handle_needed_contacts,
789
789
                                                                 g_object_ref (contact));
790
790
                }
791
 
                if (G_STR_EMPTY (id)) {
 
791
                if (EMP_STR_EMPTY (id)) {
792
792
                        g_array_append_val (id_needed, handle);
793
793
                        id_needed_contacts = g_list_prepend (id_needed_contacts,
794
794
                                                             g_object_ref (contact));
856
856
                        TP_IFACE_CHANNEL ".ChannelType");
857
857
                if (chan_type == NULL ||
858
858
                    tp_strdiff (g_value_get_string (chan_type),
859
 
                                EMP_IFACE_CHANNEL_TYPE_FILE_TRANSFER)) {
 
859
                                TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER)) {
860
860
                        continue;
861
861
                }
862
862
 
879
879
                        empathy_contact_set_capabilities (contact, caps |
880
880
                                EMPATHY_CAPABILITIES_FT);
881
881
                }
882
 
 
883
882
                break;
884
883
        }
885
884
 
973
972
                return;
974
973
        }
975
974
 
976
 
        mc = empathy_mission_control_new ();
 
975
        mc = empathy_mission_control_dup_singleton ();
977
976
        priv->connection = mission_control_get_tpconnection (mc, priv->account, NULL);
978
977
        if (!priv->connection) {
979
978
                return;