[Pkg-telepathy-commits] [empathy] 06/08: Imported Upstream version 3.12.0+64+gc963117
Simon McVittie
smcv at debian.org
Thu Mar 27 20:12:08 UTC 2014
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch telepathy1
in repository empathy.
commit ac1f04c74ef4b350b3082606b2673f45533d9c63
Author: Simon McVittie <smcv at debian.org>
Date: Thu Mar 27 19:12:20 2014 +0000
Imported Upstream version 3.12.0+64+gc963117
---
data/Empathy.Auth.client | 10 +++---
data/Empathy.FileTransfer.client | 2 +-
help/ca/figures/empathy-main-window.png | Bin 0 -> 9515 bytes
help/de/figures/empathy-main-window.png | Bin 0 -> 49766 bytes
help/el/figures/empathy-main-window.png | Bin 0 -> 10969 bytes
help/es/figures/empathy-main-window.png | Bin 0 -> 10432 bytes
help/eu/figures/empathy-main-window.png | Bin 0 -> 10261 bytes
help/fi/figures/empathy-main-window.png | Bin 0 -> 7821 bytes
help/fr/figures/empathy-main-window.png | Bin 0 -> 48810 bytes
help/it/figures/empathy-main-window.png | Bin 0 -> 10232 bytes
help/sv/figures/empathy-main-window.png | Bin 0 -> 9240 bytes
libempathy-gtk/Makefile.am | 1 +
libempathy-gtk/Makefile.in | 4 ++-
libempathy/Makefile.am | 1 +
libempathy/Makefile.in | 3 +-
libempathy/empathy-presence-manager.c | 59 +++++++++++++++++---------------
src/empathy-debug-window.c | 38 ++++++++++++++------
src/empathy-import-pidgin.c | 9 +++--
src/empathy.c | 41 +++++++++++-----------
tests/empathy-tls-test.c | 4 +--
20 files changed, 99 insertions(+), 73 deletions(-)
diff --git a/data/Empathy.Auth.client b/data/Empathy.Auth.client
index 9e8ad17..d24a583 100644
--- a/data/Empathy.Auth.client
+++ b/data/Empathy.Auth.client
@@ -5,13 +5,13 @@ Interfaces=im.telepathy.v1.Client.Handler;im.telepathy.v1.Client.Observer
DelayApprovers=true
[im.telepathy.v1.Client.Handler.HandlerChannelFilter 0]
-im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.ServerTLSConnection
+im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.ServerTLSConnection1
im.telepathy.v1.Channel.TargetEntityType u=0
[im.telepathy.v1.Client.Handler.HandlerChannelFilter 1]
-im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.ServerAuthentication
-im.telepathy.v1.Channel.Type.ServerAuthentication.AuthenticationMethod s=im.telepathy.v1.Channel.Interface.SASLAuthentication
+im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.ServerAuthentication1
+im.telepathy.v1.Channel.Type.ServerAuthentication1.AuthenticationMethod s=im.telepathy.v1.Channel.Interface.SASLAuthentication1
[im.telepathy.v1.Client.Observer.ObserverChannelFilter 0]
-im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.ServerAuthentication
-im.telepathy.v1.Channel.Type.ServerAuthentication.AuthenticationMethod s=im.telepathy.v1.Channel.Interface.SASLAuthentication
+im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.ServerAuthentication1
+im.telepathy.v1.Channel.Type.ServerAuthentication1.AuthenticationMethod s=im.telepathy.v1.Channel.Interface.SASLAuthentication1
diff --git a/data/Empathy.FileTransfer.client b/data/Empathy.FileTransfer.client
index 9a8af5d..ae97f05 100644
--- a/data/Empathy.FileTransfer.client
+++ b/data/Empathy.FileTransfer.client
@@ -2,6 +2,6 @@
Interfaces=im.telepathy.v1.Client.Handler
[im.telepathy.v1.Client.Handler.HandlerChannelFilter 0]
-im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.FileTransfer
+im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.FileTransfer1
im.telepathy.v1.Channel.TargetEntityType u=1
im.telepathy.v1.Channel.Requested b=false
diff --git a/help/ca/figures/empathy-main-window.png b/help/ca/figures/empathy-main-window.png
new file mode 100644
index 0000000..bc761bd
Binary files /dev/null and b/help/ca/figures/empathy-main-window.png differ
diff --git a/help/de/figures/empathy-main-window.png b/help/de/figures/empathy-main-window.png
new file mode 100644
index 0000000..3daa37c
Binary files /dev/null and b/help/de/figures/empathy-main-window.png differ
diff --git a/help/el/figures/empathy-main-window.png b/help/el/figures/empathy-main-window.png
new file mode 100644
index 0000000..39a0bf8
Binary files /dev/null and b/help/el/figures/empathy-main-window.png differ
diff --git a/help/es/figures/empathy-main-window.png b/help/es/figures/empathy-main-window.png
new file mode 100644
index 0000000..6d9b731
Binary files /dev/null and b/help/es/figures/empathy-main-window.png differ
diff --git a/help/eu/figures/empathy-main-window.png b/help/eu/figures/empathy-main-window.png
new file mode 100644
index 0000000..d277e70
Binary files /dev/null and b/help/eu/figures/empathy-main-window.png differ
diff --git a/help/fi/figures/empathy-main-window.png b/help/fi/figures/empathy-main-window.png
new file mode 100644
index 0000000..0db8ead
Binary files /dev/null and b/help/fi/figures/empathy-main-window.png differ
diff --git a/help/fr/figures/empathy-main-window.png b/help/fr/figures/empathy-main-window.png
new file mode 100644
index 0000000..61dd25b
Binary files /dev/null and b/help/fr/figures/empathy-main-window.png differ
diff --git a/help/it/figures/empathy-main-window.png b/help/it/figures/empathy-main-window.png
new file mode 100644
index 0000000..0752030
Binary files /dev/null and b/help/it/figures/empathy-main-window.png differ
diff --git a/help/sv/figures/empathy-main-window.png b/help/sv/figures/empathy-main-window.png
new file mode 100644
index 0000000..4d98333
Binary files /dev/null and b/help/sv/figures/empathy-main-window.png differ
diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am
index b425b33..1213b8b 100644
--- a/libempathy-gtk/Makefile.am
+++ b/libempathy-gtk/Makefile.am
@@ -175,6 +175,7 @@ libempathy_gtk_la_LIBADD = \
$(GCR_LIBS) \
$(MEEGO_LIBS) \
$(CHEESE_LIBS) \
+ $(UDEV_LIBS) \
$(top_builddir)/libempathy/libempathy.la
check_c_sources = \
diff --git a/libempathy-gtk/Makefile.in b/libempathy-gtk/Makefile.in
index 3a1d9aa..be7f1dd 100644
--- a/libempathy-gtk/Makefile.in
+++ b/libempathy-gtk/Makefile.in
@@ -149,7 +149,8 @@ libempathy_gtk_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(top_builddir)/libempathy/libempathy.la
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(top_builddir)/libempathy/libempathy.la
am__libempathy_gtk_la_SOURCES_DIST = empathy-account-chooser.c \
empathy-account-selector-dialog.c empathy-avatar-image.c \
empathy-bad-password-dialog.c empathy-base-password-dialog.c \
@@ -639,6 +640,7 @@ libempathy_gtk_la_LIBADD = \
$(GCR_LIBS) \
$(MEEGO_LIBS) \
$(CHEESE_LIBS) \
+ $(UDEV_LIBS) \
$(top_builddir)/libempathy/libempathy.la
check_c_sources = \
diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am
index 15dc4d7..386fbaf 100644
--- a/libempathy/Makefile.am
+++ b/libempathy/Makefile.am
@@ -113,6 +113,7 @@ libempathy_la_LIBADD = \
$(NETWORK_MANAGER_LIBS) \
$(CONNMAN_LIBS) \
$(UDEV_LIBS) \
+ $(CHEESE_LIBS) \
$(GOA_LIBS) \
$(UOA_LIBS) \
$(LIBM)
diff --git a/libempathy/Makefile.in b/libempathy/Makefile.in
index 532cdec..e8004ef 100644
--- a/libempathy/Makefile.in
+++ b/libempathy/Makefile.in
@@ -136,7 +136,7 @@ libempathy_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am__libempathy_la_SOURCES_DIST = action-chain-internal.h \
empathy-auth-factory.h empathy-bus-names.h \
empathy-chatroom-manager.h empathy-chatroom.h \
@@ -562,6 +562,7 @@ libempathy_la_LIBADD = \
$(NETWORK_MANAGER_LIBS) \
$(CONNMAN_LIBS) \
$(UDEV_LIBS) \
+ $(CHEESE_LIBS) \
$(GOA_LIBS) \
$(UOA_LIBS) \
$(LIBM)
diff --git a/libempathy/empathy-presence-manager.c b/libempathy/empathy-presence-manager.c
index b2127da..1b6a90b 100644
--- a/libempathy/empathy-presence-manager.c
+++ b/libempathy/empathy-presence-manager.c
@@ -37,7 +37,7 @@
struct _EmpathyPresenceManagerPrivate
{
- DBusGProxy *gs_proxy;
+ guint status_changed_id;
gboolean ready;
@@ -150,12 +150,24 @@ ext_away_start (EmpathyPresenceManager *self)
}
static void
-session_status_changed_cb (DBusGProxy *gs_proxy,
- SessionStatus status,
- EmpathyPresenceManager *self)
+session_status_changed_cb (GDBusConnection *connection,
+ const gchar *sender_name,
+ const gchar *object_path,
+ const gchar *interface_name,
+ const gchar *signal_name,
+ GVariant *parameters,
+ gpointer user_data)
{
+ EmpathyPresenceManager *self = EMPATHY_PRESENCE_MANAGER (user_data);
gboolean is_idle;
+ guint32 status;
+ if (!g_variant_is_of_type (parameters, G_VARIANT_TYPE ("(u)")))
+ {
+ return;
+ }
+
+ g_variant_get (parameters, "(u)", &status);
is_idle = (status == SESSION_STATUS_IDLE);
DEBUG ("Session idle state changed, %s -> %s",
@@ -226,7 +238,13 @@ presence_manager_dispose (GObject *object)
{
EmpathyPresenceManager *self = (EmpathyPresenceManager *) object;
- tp_clear_object (&self->priv->gs_proxy);
+ if (self->priv->status_changed_id != 0)
+ g_dbus_connection_signal_unsubscribe (
+ tp_proxy_get_dbus_connection (self->priv->manager),
+ self->priv->status_changed_id);
+
+ self->priv->status_changed_id = 0;
+
tp_clear_object (&self->priv->manager);
tp_clear_pointer (&self->priv->connect_times, g_hash_table_unref);
@@ -440,8 +458,6 @@ account_manager_ready_cb (GObject *source_object,
static void
empathy_presence_manager_init (EmpathyPresenceManager *self)
{
- TpDBusDaemon *dbus;
-
self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
EMPATHY_TYPE_PRESENCE_MANAGER, EmpathyPresenceManagerPrivate);
@@ -456,28 +472,17 @@ empathy_presence_manager_init (EmpathyPresenceManager *self)
"most-available-presence-changed",
G_CALLBACK (most_available_presence_changed), self, 0);
- dbus = tp_dbus_daemon_dup (NULL);
-
- self->priv->gs_proxy = dbus_g_proxy_new_for_name (
- tp_proxy_get_dbus_connection (dbus),
+ self->priv->status_changed_id = g_dbus_connection_signal_subscribe (
+ tp_proxy_get_dbus_connection (self->priv->manager),
"org.gnome.SessionManager",
+ "org.gnome.SessionManager.Presence",
+ "StatusChanged",
"/org/gnome/SessionManager/Presence",
- "org.gnome.SessionManager.Presence");
-
- if (self->priv->gs_proxy)
- {
- dbus_g_proxy_add_signal (self->priv->gs_proxy, "StatusChanged",
- G_TYPE_UINT, G_TYPE_INVALID);
- dbus_g_proxy_connect_signal (self->priv->gs_proxy, "StatusChanged",
- G_CALLBACK (session_status_changed_cb),
- self, NULL);
- }
- else
- {
- DEBUG ("Failed to get gs proxy");
- }
-
- g_object_unref (dbus);
+ NULL, /* arg0 */
+ G_DBUS_SIGNAL_FLAGS_NONE,
+ session_status_changed_cb,
+ self,
+ NULL);
self->priv->connect_times = g_hash_table_new (g_direct_hash, g_direct_equal);
}
diff --git a/src/empathy-debug-window.c b/src/empathy-debug-window.c
index 8714628..cb6ea12 100644
--- a/src/empathy-debug-window.c
+++ b/src/empathy-debug-window.c
@@ -1110,22 +1110,29 @@ add_service (EmpathyDebugWindow *self,
}
static void
-list_names_cb (TpDBusDaemon *bus_daemon,
- const gchar * const *names,
- const GError *error,
- gpointer user_data,
- GObject *weak_object)
+list_names_cb (GObject *source_object,
+ GAsyncResult *result,
+ gpointer user_data)
{
- EmpathyDebugWindow *self = EMPATHY_DEBUG_WINDOW (weak_object);
+ EmpathyDebugWindow *self = EMPATHY_DEBUG_WINDOW (user_data);
guint i;
+ GVariant *tuple = NULL;
+ GError *error = NULL;
+ const gchar **names = NULL;
- if (error != NULL)
+ tuple = g_dbus_connection_call_finish (G_DBUS_CONNECTION (source_object),
+ result, &error);
+
+ if (tuple == NULL)
{
DEBUG ("Failed to list names: %s", error->message);
- return;
+ g_error_free (error);
+ goto out;
}
- for (i = 0; names[i] != NULL; i++)
+ g_variant_get (tuple, "(^a&s)", &names);
+
+ for (i = 0; names != NULL && names[i] != NULL; i++)
{
if (g_str_has_prefix (names[i], TP_CLIENT_BUS_NAME_BASE))
{
@@ -1142,6 +1149,12 @@ list_names_cb (TpDBusDaemon *bus_daemon,
add_service (self, names[i], "Mission-Control", SERVICE_TYPE_MC);
}
}
+
+ g_variant_unref (tuple);
+
+out:
+ g_object_unref (self);
+ g_free (names);
}
static void
@@ -1162,8 +1175,11 @@ debug_window_fill_service_chooser (EmpathyDebugWindow *self)
self->priv->services_detected = 0;
self->priv->name_owner_cb_count = 0;
- tp_dbus_daemon_list_names (self->priv->dbus, 2000,
- list_names_cb, NULL, NULL, G_OBJECT (self));
+ g_dbus_connection_call (tp_proxy_get_dbus_connection (self->priv->dbus),
+ "org.freedesktop.DBus", "/org/freedesktop/DBus",
+ "org.freedesktop.DBus", "ListNames", NULL,
+ G_VARIANT_TYPE ("(as)"), G_DBUS_CALL_FLAGS_NONE, 2000, NULL,
+ list_names_cb, g_object_ref (self));
self->priv->name_owner_changed_signal =
tp_cli_dbus_daemon_connect_to_name_owner_changed (self->priv->dbus,
diff --git a/src/empathy-import-pidgin.c b/src/empathy-import-pidgin.c
index 11baf4f..e98897c 100644
--- a/src/empathy-import-pidgin.c
+++ b/src/empathy-import-pidgin.c
@@ -23,7 +23,6 @@
#include "empathy-import-pidgin.h"
#include <glib/gstdio.h>
-#include <dbus/dbus-protocol.h>
#include <tp-account-widgets/tpaw-utils.h>
#include "empathy-import-utils.h"
@@ -149,14 +148,14 @@ import_dialog_pidgin_parse_setting (EmpathyImportAccountData *data,
i = (gint) g_ascii_strtod (content, NULL);
- if (signature_i == DBUS_TYPE_INT16 ||
- signature_i == DBUS_TYPE_INT32)
+ if (signature_i == (int) G_VARIANT_CLASS_INT16 ||
+ signature_i == (int) G_VARIANT_CLASS_INT32)
{
value = tp_g_value_slice_new (G_TYPE_INT);
g_value_set_int (value, i);
}
- else if (signature_i == DBUS_TYPE_UINT16 ||
- signature_i == DBUS_TYPE_UINT32)
+ else if (signature_i == (int) G_VARIANT_CLASS_UINT16 ||
+ signature_i == (int) G_VARIANT_CLASS_UINT32)
{
value = tp_g_value_slice_new (G_TYPE_UINT);
g_value_set_uint (value, (guint) i);
diff --git a/src/empathy.c b/src/empathy.c
index c353684..a36c61e 100644
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -225,28 +225,23 @@ empathy_presence_manager_set_auto_away_cb (GSettings *gsettings,
#define GNOME_SHELL_BUS_NAME "org.gnome.Shell"
static void
-list_names_cb (TpDBusDaemon *bus_daemon,
- const gchar * const *names,
- const GError *error,
- gpointer user_data,
- GObject *weak_object)
+shell_name_owner_cb (GObject *source_object,
+ GAsyncResult *result,
+ gpointer user_data)
{
- EmpathyApp *self = (EmpathyApp *) weak_object;
- guint i;
+ EmpathyApp *self = EMPATHY_APP (user_data);
+ GVariant *tuple;
- if (error != NULL)
- goto out;
+ tuple = g_dbus_connection_call_finish (G_DBUS_CONNECTION (source_object),
+ result, NULL);
- for (i = 0; names[i] != NULL; i++)
+ if (tuple != NULL)
{
- if (!tp_strdiff (names[i], GNOME_SHELL_BUS_NAME))
- {
- self->shell_running = TRUE;
- break;
- }
+ /* we don't care *who* owns it, only that it is owned */
+ self->shell_running = TRUE;
+ g_variant_unref (tuple);
}
-out:
if (self->shell_running)
{
DEBUG ("GNOME Shell is running, don't create status icon");
@@ -275,6 +270,8 @@ out:
empathy_presence_manager_set_auto_away (self->presence_mgr, autoaway);
}
+
+ g_object_unref (self);
}
static void
@@ -285,7 +282,7 @@ empathy_app_activate (GApplication *app)
if (!self->activated)
{
GError *error = NULL;
- TpDBusDaemon *dbus;
+ GDBusConnection *dbus;
empathy_gtk_init ();
@@ -319,11 +316,15 @@ empathy_app_activate (GApplication *app)
NULL);
/* check if Shell is running */
- dbus = tp_dbus_daemon_dup (&error);
+ dbus = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);
g_assert_no_error (error);
- tp_dbus_daemon_list_names (dbus, -1, list_names_cb,
- self, NULL, G_OBJECT (self));
+ g_dbus_connection_call (dbus,
+ "org.freedesktop.DBus", "/org/freedesktop/DBus",
+ "org.freedesktop.DBus", "GetNameOwner",
+ g_variant_new ("(s)", GNOME_SHELL_BUS_NAME),
+ G_VARIANT_TYPE ("(s)"), G_DBUS_CALL_FLAGS_NONE, -1, NULL,
+ shell_name_owner_cb, g_object_ref (self));
g_object_unref (dbus);
diff --git a/tests/empathy-tls-test.c b/tests/empathy-tls-test.c
index 91b0576..df4f93a 100644
--- a/tests/empathy-tls-test.c
+++ b/tests/empathy-tls-test.c
@@ -162,7 +162,7 @@ mock_tls_certificate_class_init (MockTLSCertificateClass *klass)
static void
mock_tls_certificate_accept (TpSvcAuthenticationTLSCertificate *base,
- DBusGMethodInvocation *context)
+ GDBusMethodInvocation *context)
{
MockTLSCertificate *self = MOCK_TLS_CERTIFICATE (base);
self->state = TP_TLS_CERTIFICATE_STATE_ACCEPTED;
@@ -173,7 +173,7 @@ mock_tls_certificate_accept (TpSvcAuthenticationTLSCertificate *base,
static void
mock_tls_certificate_reject (TpSvcAuthenticationTLSCertificate *base,
const GPtrArray *in_Rejections,
- DBusGMethodInvocation *context)
+ GDBusMethodInvocation *context)
{
MockTLSCertificate *self = MOCK_TLS_CERTIFICATE (base);
self->state = TP_TLS_CERTIFICATE_STATE_REJECTED;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/empathy.git
More information about the Pkg-telepathy-commits
mailing list