← Back to branch summary

~ubuntu-branches/ubuntu/precise/empathy/precise-proposed-201205180810

« back to all changes in this revision

Viewing changes to libempathy-gtk/empathy-protocol-chooser.h

  • Committer: Bazaar Package Importer
  • Author(s): Brian Curtis, Brian Curtis, Ken VanDine
  • Date: 2011-06-01 10:35:24 UTC
  • mfrom: (1.1.70 upstream) (6.3.44 experimental)
  • Revision ID: james.westby@ubuntu.com-20110601103524-wx3wgp71394730jt
Tags: 3.1.1-1ubuntu1
[ Brian Curtis ]
* Merge with Debian experimental, remaining Ubuntu changes:
* debian/control:
  - Drop geoclue/mapping build-depends (they are in Universe)
  - Add Vcz-Bzr link
  - Add Suggests on telepathy-idle
  - Bump telepathy-butterfly, telepathy-haze to recommends
  - Don't recommend the freedesktop sound theme we have an ubuntu one
  - Add build depend for libunity-dev
* debian/rules:
  - Use autoreconf.mk
  - Disable map and location
* debian/empathy.install:
  - Install message indicator configuration
* debian/indicators/empathy:
  - Message indicator configuration
* debian/patches/01_lpi.patch:
  - Add Launchpad integration
* debian/patches/10_use_notify_osd_icons.patch:
  - Use the notify-osd image for new messages
* debian/patches/34_start_raised_execpt_in_session.patch
  - If not started with the session, we should always raise
* debian/patches/36_chat_window_default_size.patch:
  - Make the default chat window size larger
* debian/patches/37_facebook_default.patch:
  - Make facebook the default chat account type
* debian/patches/38_lp_569289.patch
  - Set freenode as default IRC network for new IRC accounts 
* debian/patches/41_unity_launcher_progress.patch
  - Display file transfer progress in the unity launcher

[ Ken VanDine ]
* debian/control
  - build depend on libgcr-3-dev instead of libgcr-dev
  - dropped build depends for libindicate, we will use telepathy-indicator
  - Depend on dconf-gsettings-backend | gsettings-backend
  - Added a Recommends for telepathy-indicator
* +debian/empathy.gsettings-override
  - Added an override for notifications-focus
* debian/patches/series
  - commented out 23_idomessagedialog_for_voip_and_ft.patch, until ido has 
    been ported to gtk3

Show diffs side-by-side

added added

removed removed

Lines of Context:
libempathy-gtk/empathy-protocol-chooser.h
28
28
 
29
29
#include <telepathy-glib/connection-manager.h>
30
30
 
 
31
#include <libempathy/empathy-account-settings.h>
 
32
 
31
33
G_BEGIN_DECLS
32
34
 
33
35
#define EMPATHY_TYPE_PROTOCOL_CHOOSER (empathy_protocol_chooser_get_type ())
60
62
 
61
63
typedef gboolean (*EmpathyProtocolChooserFilterFunc) (TpConnectionManager *cm,
62
64
    TpConnectionManagerProtocol *protocol,
63
 
    gboolean is_gtalk,
64
 
    gboolean is_facebook,
 
65
    const gchar *service,
65
66
    gpointer user_data);
66
67
 
67
68
GType empathy_protocol_chooser_get_type (void) G_GNUC_CONST;
69
70
TpConnectionManager *empathy_protocol_chooser_dup_selected (
70
71
    EmpathyProtocolChooser *protocol_chooser,
71
72
    TpConnectionManagerProtocol **protocol,
72
 
    gboolean *is_gtalk,
73
 
    gboolean *is_facebook);
 
73
    gchar **service);
74
74
 
75
75
void empathy_protocol_chooser_set_visible (
76
76
    EmpathyProtocolChooser *protocol_chooser,
77
77
    EmpathyProtocolChooserFilterFunc func,
78
78
    gpointer user_data);
79
79
 
 
80
EmpathyAccountSettings * empathy_protocol_chooser_create_account_settings (
 
81
    EmpathyProtocolChooser *self);
 
82
 
80
83
G_END_DECLS
81
84
#endif /*  __EMPATHY_PROTOCOL_CHOOSER_H__ */