[empathy/mc5: 479/483] Merge back from master
- From: Sjoerd Simons <sjoerds src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [empathy/mc5: 479/483] Merge back from master
- Date: Fri, 21 Aug 2009 17:22:31 +0000 (UTC)
commit 84e30dab1428affe335ef904377d07f8b5fdeb66
Merge: fd8e9c5... 3803736...
Author: Sjoerd Simons <sjoerd simons collabora co uk>
Date: Fri Aug 21 17:37:48 2009 +0100
Merge back from master
configure.ac | 55 +-
data/Makefile.am | 6 +
data/codec-preferences | 36 +
data/element-properties | 32 +
data/empathy.schemas.in | 10 +-
data/icons/hicolor_apps_16x16_im-msn.png | Bin 762 -> 835 bytes
data/icons/hicolor_apps_22x22_im-msn.png | Bin 1086 -> 1281 bytes
data/icons/hicolor_apps_24x24_im-msn.png | Bin 1203 -> 1407 bytes
data/icons/hicolor_apps_32x32_im-msn.png | Bin 1734 -> 1660 bytes
data/icons/hicolor_apps_48x48_im-msn.png | Bin 2876 -> 2778 bytes
data/icons/hicolor_apps_scalable_im-msn.svg | 380 ++---
extensions/Connection_Interface_Location.xml | 330 ---
extensions/Debug.xml | 5 +-
extensions/Makefile.am | 1 -
extensions/misc.xml | 1 -
help/.gitignore | 11 +
help/C/add-account.page | 96 +
help/C/add-contact.page | 63 +
help/C/audio-call.page | 67 +
help/C/audio-video.page | 148 ++
help/C/change-status.page | 51 +
help/C/create-account.page | 137 ++
help/C/disable-account.page | 66 +
help/C/empathy.xml | 1395 ------------
help/C/favorite-rooms.page | 135 ++
help/C/figures/audio-input-microphone.png | Bin 0 -> 650 bytes
help/C/figures/available.png | Bin 0 -> 689 bytes
help/C/figures/away.png | Bin 0 -> 538 bytes
help/C/figures/busy.png | Bin 0 -> 616 bytes
help/C/figures/camera-web.png | Bin 0 -> 881 bytes
help/C/figures/empathy-main-window.png | Bin 8902 -> 7703 bytes
help/C/geolocation-not-showing.page | 37 +
help/C/geolocation-privacy.page | 89 +
help/C/geolocation-supported.page | 47 +
help/C/geolocation-turn.page | 59 +
help/C/geolocation-what-is.page | 58 +
help/C/geolocation.page | 33 +
help/C/group-conversations.page | 140 ++
help/C/index.page | 42 +
help/C/introduction.page | 46 +
help/C/irc-account.page | 128 ++
help/C/irc-join-pwd.page | 27 +
help/C/irc-join-room.page | 54 +
help/C/irc-manage.page | 33 +
help/C/irc-nick-password.page | 96 +
help/C/irc-sending-file.page | 27 +
help/C/irc-start-conversation.page | 62 +
help/C/legal.xml | 85 +-
help/C/offline-contacts.page | 50 +
help/C/prev-conv.page | 153 ++
help/C/prob-conn-acctdisabled.page | 67 +
help/C/prob-conn-auth.page | 67 +
help/C/prob-conn-name.page | 62 +
help/C/prob-conn-neterror.page | 74 +
help/C/prob-conn.page | 26 +
help/C/remove-account.page | 70 +
help/C/salut-protocol.page | 43 +
help/C/send-file.page | 89 +
help/C/send-message.page | 51 +
help/C/set-custom-status.page | 166 ++
help/C/share-desktop.page | 85 +
help/C/start-conversation.page | 71 +
help/C/status-icons.page | 97 +
help/C/video-call.page | 68 +
help/Makefile.am | 53 +-
help/de/de.po | 13 +-
help/es/es.po | 2455 +++++++++++----------
libempathy-gtk/empathy-audio-sink.c | 10 +-
libempathy-gtk/empathy-audio-src.c | 12 +-
libempathy-gtk/empathy-chat.c | 25 +-
libempathy-gtk/empathy-conf.h | 2 +-
libempathy-gtk/empathy-contact-list-view.c | 8 +
libempathy-gtk/empathy-contact-list-view.h | 1 +
libempathy-gtk/empathy-contact-widget.c | 4 +
libempathy-gtk/empathy-location-manager.c | 48 +-
libempathy-gtk/empathy-presence-chooser.c | 27 +
libempathy-gtk/empathy-share-my-desktop.c | 2 +-
libempathy-gtk/empathy-status-preset-dialog.ui | 4 +-
libempathy-gtk/empathy-theme-adium.c | 60 +-
libempathy-gtk/empathy-ui-utils.c | 23 +-
libempathy-gtk/empathy-ui-utils.h | 2 +
libempathy/Makefile.am | 8 +-
libempathy/empathy-call-handler.c | 101 +-
libempathy/empathy-connectivity.c | 433 ++++
libempathy/empathy-connectivity.h | 71 +
libempathy/empathy-debug.c | 1 +
libempathy/empathy-debug.h | 1 +
libempathy/empathy-idle.c | 159 +-
libempathy/empathy-idle.h | 3 -
libempathy/empathy-tp-chat.c | 17 +-
libempathy/empathy-tp-contact-factory.c | 14 +-
libempathy/empathy-tp-contact-list.c | 28 +-
po/ChangeLog | 4 +
po/LINGUAS | 3 +
po/POTFILES.in | 2 +-
po/ar.po | 382 ++--
po/br.po | 2553 +++++++++++++++++++++
po/ca.po | 2308 ++++++++++++-------
po/ca valencia po | 2873 ++++++++++++++++++++++++
po/cs.po | 2158 ++++++++++++------
po/de.po | 2223 ++++++++++++-------
po/es.po | 326 ++--
po/et.po | 854 ++++----
po/eu.po | 1919 ++++++++++-------
po/fi.po | 2120 +++++++++++-------
po/ga.po | 2781 +++++++++++++++++------
po/gl.po | 483 +++--
po/he.po | 1255 ++++++-----
po/kn.po | 2184 +++++++++++-------
po/nb.po | 1257 ++++++-----
po/or.po | 706 ++++---
po/pt_BR.po | 2348 +++++++++++++-------
po/sv.po | 415 ++--
po/te.po | 2813 +++++++++++++++++++++++
po/tr.po | 2508 ++++++++++++++-------
po/uk.po | 2581 +++++++++++++++------
po/zh_HK.po | 2051 ++++++++++-------
po/zh_TW.po | 2054 ++++++++++-------
python/pyempathy/pyempathy.defs | 16 +-
python/pyempathygtk/pyempathygtk.defs | 8 +
src/empathy-call-window-fullscreen.ui | 2 +-
src/empathy-call-window.c | 100 +-
src/empathy-chat-window.c | 31 +-
src/empathy-map-view.c | 25 +-
src/empathy-preferences.c | 15 +-
src/empathy-preferences.ui | 2 +-
src/empathy-status-icon.c | 35 +-
src/empathy.c | 41 +-
128 files changed, 34658 insertions(+), 15690 deletions(-)
---
diff --cc configure.ac
index 0e11a66,bc0491c..7576c8e
--- a/configure.ac
+++ b/configure.ac
@@@ -29,7 -29,8 +29,7 @@@ GLIB_REQUIRED=2.16.
GTK_REQUIRED=2.16.0
GCONF_REQUIRED=1.2.0
LIBPANELAPPLET_REQUIRED=2.10.0
- TELEPATHY_GLIB_REQUIRED=0.7.31
+ TELEPATHY_GLIB_REQUIRED=0.7.34
-MISSION_CONTROL_REQUIRED=4.61
ENCHANT_REQUIRED=1.2.0
ISO_CODES_REQUIRED=0.35
LIBNOTIFY_REQUIRED=0.4.4
diff --cc libempathy/empathy-idle.c
index 94764f4,ac0ca72..c86b997
--- a/libempathy/empathy-idle.c
+++ b/libempathy/empathy-idle.c
@@@ -28,13 -28,11 +28,11 @@@
#include <telepathy-glib/dbus.h>
#include <telepathy-glib/util.h>
-#include <libmissioncontrol/mc-enum-types.h>
+#include "empathy-account-manager.h"
#include "empathy-idle.h"
#include "empathy-utils.h"
+ #include "empathy-connectivity.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
#include "empathy-debug.h"
@@@ -44,26 -42,22 +42,23 @@@
#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyIdle)
typedef struct {
- MissionControl *mc;
DBusGProxy *gs_proxy;
- #ifdef HAVE_NM
- NMClient *nm_client;
- #endif
+ EmpathyConnectivity *connectivity;
+ gulong state_change_signal_id;
TpConnectionPresenceType state;
gchar *status;
TpConnectionPresenceType flash_state;
gboolean auto_away;
- gboolean use_nm;
TpConnectionPresenceType away_saved_state;
- TpConnectionPresenceType nm_saved_state;
- gchar *nm_saved_status;
+ TpConnectionPresenceType saved_state;
+ gchar *saved_status;
gboolean is_idle;
- gboolean nm_connected;
guint ext_away_timeout;
+
+ EmpathyAccountManager *manager;
} EmpathyIdlePriv;
typedef enum {
diff --cc src/empathy.c
index 3cc494a,660e47c..718fe70
--- a/src/empathy.c
+++ b/src/empathy.c
@@@ -30,10 -30,9 +30,10 @@@
#include <glib/gi18n.h>
#include <gtk/gtk.h>
#include <gdk/gdkx.h>
+#include <unique/unique.h>
#if HAVE_LIBCHAMPLAIN
- #include <clutter-gtk/gtk-clutter-embed.h>
+ #include <clutter-gtk/clutter-gtk.h>
#endif
#include <libebook/e-book.h>
@@@ -48,9 -46,8 +48,10 @@@
#include <libempathy/empathy-utils.h>
#include <libempathy/empathy-call-factory.h>
#include <libempathy/empathy-chatroom-manager.h>
+#include <libempathy/empathy-account-settings.h>
+ #include <libempathy/empathy-connectivity.h>
#include <libempathy/empathy-account-manager.h>
+#include <libempathy/empathy-connection-managers.h>
#include <libempathy/empathy-debugger.h>
#include <libempathy/empathy-dispatcher.h>
#include <libempathy/empathy-dispatch-operation.h>
@@@ -148,61 -146,11 +149,48 @@@ dispatch_cb (EmpathyDispatcher *dispatc
}
}
--static void
- use_nm_notify_cb (EmpathyConf *conf,
- const gchar *key,
- gpointer user_data)
- {
- EmpathyIdle *idle = user_data;
- gboolean use_nm;
-
- if (empathy_conf_get_bool (conf, key, &use_nm)) {
- empathy_idle_set_use_nm (idle, use_nm);
- }
- }
-
-service_ended_cb (MissionControl *mc,
- gpointer user_data)
+/* Salut account creation */
+static gboolean
+should_create_salut_account (void)
{
- DEBUG ("Mission Control stopped");
+ EmpathyAccountManager *manager;
+ gboolean salut_created = FALSE;
+ GList *accounts, *l;
+
+ /* Check if we already created a salut account */
+ empathy_conf_get_bool (empathy_conf_get (),
+ EMPATHY_PREFS_SALUT_ACCOUNT_CREATED,
+ &salut_created);
+
+ if (salut_created)
+ {
+ DEBUG ("Gconf says we already created a salut account once");
+ return FALSE;
+ }
+
+ manager = empathy_account_manager_dup_singleton ();
+ accounts = empathy_account_manager_dup_accounts (manager);
+
+ for (l = accounts; l != NULL; l = g_list_next (l)) {
+ EmpathyAccount *account = EMPATHY_ACCOUNT (l->data);
+
+ if (!tp_strdiff (empathy_account_get_protocol (account), "local-xmpp"))
+ salut_created = TRUE;
+
+ g_object_unref (account);
+ }
+
+ g_object_unref (manager);
+
+ if (salut_created)
+ {
+ DEBUG ("Existing salut account already exists, flagging so in gconf");
+ empathy_conf_set_bool (empathy_conf_get (),
+ EMPATHY_PREFS_SALUT_ACCOUNT_CREATED,
+ TRUE);
+ }
+
+ return !salut_created;
}
static void
@@@ -229,11 -209,27 +217,24 @@@ salut_account_created (GObject *source
}
static void
+ use_conn_notify_cb (EmpathyConf *conf,
+ const gchar *key,
+ gpointer user_data)
+ {
+ EmpathyConnectivity *connectivity = user_data;
+ gboolean use_conn;
+
+ if (empathy_conf_get_bool (conf, key, &use_conn)) {
+ empathy_connectivity_set_use_conn (connectivity, use_conn);
+ }
+ }
+
+ static void
-create_salut_account (void)
+create_salut_account_if_needed (EmpathyConnectionManagers *managers)
{
- McProfile *profile;
- McProtocol *protocol;
- gboolean salut_created = FALSE;
- EmpathyAccount *account;
- EmpathyAccountManager *account_manager;
- GList *accounts;
+ EmpathyAccountSettings *settings;
+ TpConnectionManager *manager;
+ const TpConnectionManagerProtocol *protocol;
EBook *book;
EContact *contact;
gchar *nickname = NULL;
@@@ -534,7 -554,9 +535,8 @@@ main (int argc, char *argv[]
EmpathyCallFactory *call_factory;
EmpathyFTFactory *ft_factory;
GtkWidget *window;
- MissionControl *mc;
EmpathyIdle *idle;
+ EmpathyConnectivity *connectivity;
gboolean autoconnect = TRUE;
gboolean no_connect = FALSE;
gboolean hide_contact_list = FALSE;
@@@ -698,9 -751,10 +704,10 @@@
empathy_idle_set_state (idle, TP_CONNECTION_PRESENCE_TYPE_OFFLINE);
- g_object_unref (mc);
g_object_unref (idle);
+ g_object_unref (connectivity);
g_object_unref (icon);
+ g_object_unref (account_manager);
g_object_unref (log_manager);
g_object_unref (dispatcher);
g_object_unref (chatroom_manager);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
