← Back to branch summary

~bcurtiswx/ubuntu/precise/empathy/3.4.2.3-0ubuntu1

« back to all changes in this revision

Viewing changes to libempathy/empathy-client-factory.c

  • Committer: Package Import Robot
  • Author(s): Ken VanDine
  • Date: 2011-12-21 15:12:56 UTC
  • mfrom: (1.1.84)
  • Revision ID: package-import@ubuntu.com-20111221151256-9b1pny75wphfmqd6
Tags: 3.3.3-0ubuntu1
https://launchpad.net/bugs/907501
* New upstream version
  - Require folks >= 0.6.6 (LP: #907501)
* debian/control
  - bump build depends for folks to >= 0.6.6
* debian/watch
  - use the .xz file

Show diffs side-by-side

added added

removed removed

Lines of Context:
libempathy/empathy-client-factory.c
24
24
#include "empathy-client-factory.h"
25
25
 
26
26
#include "empathy-tp-chat.h"
27
 
#include "empathy-tp-file.h"
28
27
#include "empathy-utils.h"
29
28
 
30
29
#include <telepathy-yell/telepathy-yell.h>
89
88
      return TP_CHANNEL (call_channel_new_with_factory (
90
89
            TP_SIMPLE_CLIENT_FACTORY (factory), conn, path, properties, error));
91
90
    }
92
 
  else if (!tp_strdiff (chan_type, TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER))
93
 
    {
94
 
      return TP_CHANNEL (empathy_tp_file_new (
95
 
            TP_SIMPLE_CLIENT_FACTORY (factory), conn, path, properties, error));
96
 
    }
97
91
 
98
92
  return chainup->create_channel (factory, conn, path, properties, error);
99
93
}
170
164
  return features;
171
165
}
172
166
 
 
167
static GArray *
 
168
empathy_client_factory_dup_contact_features (TpSimpleClientFactory *factory,
 
169
        TpConnection *connection)
 
170
{
 
171
  GArray *features;
 
172
  TpContactFeature feature;
 
173
 
 
174
  features = chainup->dup_contact_features (factory, connection);
 
175
 
 
176
  /* Needed by empathy_individual_add_menu_item_new to check if a contact is
 
177
   * already in the contact list. This feature is pretty cheap to prepare as
 
178
   * it doesn't prepare the full roster. */
 
179
  feature = TP_CONTACT_FEATURE_SUBSCRIPTION_STATES;
 
180
  g_array_append_val (features, feature);
 
181
 
 
182
  return features;
 
183
}
 
184
 
173
185
static void
174
186
empathy_client_factory_class_init (EmpathyClientFactoryClass *cls)
175
187
{
184
196
 
185
197
  simple_class->dup_connection_features =
186
198
    empathy_client_factory_dup_connection_features;
 
199
 
 
200
  simple_class->dup_contact_features =
 
201
    empathy_client_factory_dup_contact_features;
187
202
}
188
203
 
189
204
static void