[Pkg-telepathy-commits] ./packages/unstable/telepathy-mission-control r66: * New upstream version (4.53)
Laurent Bigonville
bigon at bigon.be
Sat Feb 23 11:13:58 UTC 2008
------------------------------------------------------------
revno: 66
committer: Laurent Bigonville <bigon at bigon.be>
branch nick: telepathy-mission-control
timestamp: Mon 2008-01-14 11:48:56 +0100
message:
* New upstream version (4.53)
* Add XS-Dm-Upload-Allowed: yes
* Drop debian/patches/add_signals_to_proxy.patch: Applied upstream
* Drop debian/patches/emit_presence_changed_on_status_changed.patch: Applied
upstream
* Drop debian/patches/mcd_copy_channel_type.patch: Applied upstream
* Drop debian/patches/set_avatar_if_none_set.patch: Applied upstream
removed:
patches/add_signals_to_proxy.patch
patches/emit_presence_changed_on_status_changed.patch
patches/mcd_copy_channel_type.patch
patches/set_avatar_if_none_set.patch
modified:
changelog
control
-------------- next part --------------
=== modified file 'changelog'
--- a/changelog 2008-01-05 19:00:49 +0000
+++ b/changelog 2008-01-14 10:48:56 +0000
@@ -1,3 +1,15 @@
+telepathy-mission-control (4.53-1) UNRELEASED; urgency=low
+
+ * New upstream version (4.53)
+ * Add XS-Dm-Upload-Allowed: yes
+ * Drop debian/patches/add_signals_to_proxy.patch: Applied upstream
+ * Drop debian/patches/emit_presence_changed_on_status_changed.patch: Applied
+ upstream
+ * Drop debian/patches/mcd_copy_channel_type.patch: Applied upstream
+ * Drop debian/patches/set_avatar_if_none_set.patch: Applied upstream
+
+ -- Laurent Bigonville <bigon at bigon.be> Mon, 14 Jan 2008 11:20:07 +0100
+
telepathy-mission-control (4.51-2) unstable; urgency=low
[ Laurent Bigonville ]
=== modified file 'control'
--- a/control 2008-01-05 18:47:21 +0000
+++ b/control 2008-01-14 10:48:56 +0000
@@ -16,6 +16,7 @@
gtk-doc-tools
Standards-Version: 3.7.3
Vcs-Bzr: http://bzr.debian.org/pkg-telepathy/packages/unstable/telepathy-mission-control/
+XS-Dm-Upload-Allowed: yes
Package: telepathy-mission-control
Architecture: any
=== removed file 'patches/add_signals_to_proxy.patch'
--- a/patches/add_signals_to_proxy.patch 2008-01-05 20:38:24 +0000
+++ b/patches/add_signals_to_proxy.patch 1970-01-01 00:00:00 +0000
@@ -1,44 +0,0 @@
-Index: libmissioncontrol/mission-control.c
-===================================================================
---- libmissioncontrol/mission-control.c (revision 219)
-+++ libmissioncontrol/mission-control.c (working copy)
-@@ -208,6 +208,14 @@
- dbus_g_object_register_marshaller
- (mission_control_signals_marshal_VOID__STRING_UINT, G_TYPE_NONE,
- G_TYPE_STRING, G_TYPE_UINT, G_TYPE_INVALID);
-+ /* Register the AccountPresenceChanged signal */
-+ dbus_g_object_register_marshaller
-+ (mission_control_signals_marshal_VOID__UINT_UINT_STRING_UINT_STRING, G_TYPE_NONE,
-+ G_TYPE_UINT, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_INVALID);
-+ /* Register the PresenceChanged signal */
-+ dbus_g_object_register_marshaller
-+ (mission_control_signals_marshal_VOID__UINT_STRING, G_TYPE_NONE,
-+ G_TYPE_UINT, G_TYPE_STRING, G_TYPE_INVALID);
- }
-
- static void
-@@ -358,6 +366,13 @@
- G_TYPE_STRING, G_TYPE_UINT, G_TYPE_INVALID);
- dbus_g_proxy_add_signal (DBUS_G_PROXY (mc_obj), "StatusActual",
- G_TYPE_UINT, G_TYPE_UINT, G_TYPE_INVALID);
-+ dbus_g_proxy_add_signal (DBUS_G_PROXY (mc_obj), "AccountPresenceChanged",
-+ G_TYPE_UINT, G_TYPE_UINT, G_TYPE_STRING,
-+ G_TYPE_UINT, G_TYPE_STRING,G_TYPE_INVALID);
-+ dbus_g_proxy_add_signal (DBUS_G_PROXY (mc_obj), "PresenceChanged",
-+ G_TYPE_UINT, G_TYPE_STRING, G_TYPE_INVALID);
-+
-+
- return mc_obj;
- }
-
-Index: libmissioncontrol/mission-control-signals-marshal.list
-===================================================================
---- libmissioncontrol/mission-control-signals-marshal.list (revision 219)
-+++ libmissioncontrol/mission-control-signals-marshal.list (working copy)
-@@ -3,3 +3,6 @@
- VOID:UINT,UINT
- VOID:UINT,STRING,UINT
- VOID:UINT
-+VOID:UINT,UINT,STRING,UINT,STRING
-+VOID:UINT,STRING
-+
=== removed file 'patches/emit_presence_changed_on_status_changed.patch'
--- a/patches/emit_presence_changed_on_status_changed.patch 2008-01-05 18:58:05 +0000
+++ b/patches/emit_presence_changed_on_status_changed.patch 1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
-Index: src/mcd-presence-frame.c
-===================================================================
---- src/mcd-presence-frame.c (revision 219)
-+++ src/mcd-presence-frame.c (working copy)
-@@ -484,9 +484,9 @@
- {
- McdPresenceFramePrivate *priv;
- McdActualPresenceInfo pi;
-- McPresence old_presence;
- TelepathyConnectionStatus connection_status;
- TelepathyConnectionStatusReason connection_reason;
-+ gboolean changed;
-
- g_debug ("%s called", G_STRFUNC);
-
-@@ -501,7 +501,9 @@
- connection_status = priv->actual_presence->connection_status;
- connection_reason = priv->actual_presence->connection_reason;
-
-- old_presence = priv->actual_presence->presence;
-+ changed = (priv->actual_presence->presence != pi.presence) ||
-+ (tp_strdiff (priv->actual_presence->message, presence_message));
-+
- mcd_presence_free (priv->actual_presence);
- priv->actual_presence = mcd_presence_new (pi.presence,
- presence_message,
-@@ -509,8 +511,8 @@
- connection_reason);
-
- g_debug ("%s: presence actual: %d", G_STRFUNC, pi.presence);
-- if (old_presence != pi.presence)
-- {
-+ if (changed)
-+ {
- g_signal_emit_by_name (G_OBJECT (presence_frame),
- "presence-actual", pi.presence, presence_message);
- }
-@@ -532,7 +534,8 @@
- account_presence = g_hash_table_lookup (priv->account_presence, account);
-
- g_return_if_fail (account_presence != NULL);
-- if (account_presence->presence == presence)
-+ if (account_presence->presence == presence &&
-+ !tp_strdiff (account_presence->message, presence_message))
- {
- g_debug ("%s: presence already set, not setting", G_STRFUNC);
- return;
=== removed file 'patches/mcd_copy_channel_type.patch'
--- a/patches/mcd_copy_channel_type.patch 2008-01-05 15:44:30 +0000
+++ b/patches/mcd_copy_channel_type.patch 1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
-Index: src/mcd-connection.c
-===================================================================
---- src/mcd-connection.c (revision 219)
-+++ src/mcd-connection.c (working copy)
-@@ -662,6 +662,7 @@
- pending_channel_free (McdPendingChannel *pc)
- {
- g_object_unref (pc->channel);
-+ g_free (pc->type);
- g_free (pc);
- }
-
-@@ -2186,7 +2187,7 @@
- pc = g_malloc (sizeof(McdPendingChannel));
- pc->handle = chan_handle;
- pc->handle_type = chan_handle_type;
-- pc->type = chan_type;
-+ pc->type = g_strdup(chan_type);
- pc->channel = channel;
- priv->pending_channels = g_list_prepend (priv->pending_channels, pc);
-
-@@ -2234,7 +2235,7 @@
- pc = g_malloc (sizeof(McdPendingChannel));
- pc->handle = req->channel_handle;
- pc->handle_type = req->channel_handle_type;
-- pc->type = req->channel_type;
-+ pc->type = g_strdup (req->channel_type);
- pc->channel = channel;
- priv->pending_channels = g_list_prepend (priv->pending_channels, pc);
-
=== removed file 'patches/set_avatar_if_none_set.patch'
--- a/patches/set_avatar_if_none_set.patch 2008-01-05 17:45:44 +0000
+++ b/patches/set_avatar_if_none_set.patch 1970-01-01 00:00:00 +0000
@@ -1,137 +0,0 @@
-Index: src/mcd-connection.c
-===================================================================
---- src/mcd-connection.c (revision 219)
-+++ src/mcd-connection.c (working copy)
-@@ -848,10 +848,76 @@
- }
-
- static void
-+_mcd_connection_set_avatar (McdConnectionPrivate *priv, gchar *filename,
-+ gchar *mime_type)
-+{
-+ GError *error = NULL;
-+ gchar *data = NULL;
-+ size_t length;
-+
-+ if (filename == NULL || !g_file_test (filename, G_FILE_TEST_EXISTS))
-+ {
-+ return;
-+ }
-+
-+ if (g_file_get_contents (filename, &data, &length, &error))
-+ {
-+ if (length > 0 && length < G_MAXUINT)
-+ {
-+ GArray avatar;
-+ avatar.data = data;
-+ avatar.len = (guint)length;
-+ tp_conn_iface_avatars_set_avatar_async (priv->avatars_proxy,
-+ &avatar, mime_type, set_avatar_cb, priv);
-+ }
-+ else
-+ tp_conn_iface_avatars_clear_avatar_async(priv->avatars_proxy,
-+ clear_avatar_cb, g_strdup (filename));
-+ }
-+ else
-+ {
-+ g_debug ("%s: error reading %s: %s", G_STRFUNC, filename, error->message);
-+ g_error_free (error);
-+ }
-+ g_free(data);
-+}
-+
-+static void
-+request_tokens_cb (DBusGProxy *proxy, GHashTable *tokens,
-+ GError *error, gpointer user_data)
-+{
-+ McdConnectionPrivate *priv = (McdConnectionPrivate *)user_data;
-+ const gchar *token;
-+ gchar *filename, *mime_type;
-+
-+ if (error)
-+ {
-+ g_warning ("%s: error: %s", G_STRFUNC, error->message);
-+ g_error_free (error);
-+ return;
-+ }
-+
-+ token = g_hash_table_lookup (tokens, GUINT_TO_POINTER (priv->self_handle));
-+ if (token == NULL || *token != '\0')
-+ return;
-+
-+ if (!mc_account_get_avatar (priv->account, &filename, &mime_type, NULL))
-+ {
-+ g_debug ("%s: mc_account_get_avatar() returned FALSE", G_STRFUNC);
-+ return;
-+ }
-+
-+ g_debug ("No avatar set, setting our own");
-+ _mcd_connection_set_avatar (priv, filename, mime_type);
-+
-+ g_free (filename);
-+ g_free (mime_type);
-+}
-+
-+static void
- _mcd_connection_setup_avatar (McdConnectionPrivate *priv)
- {
- gchar *filename, *mime_type, *token;
-- GError *error = NULL;
-
- priv->avatars_proxy = tp_conn_get_interface (priv->tp_conn,
- TELEPATHY_CONN_IFACE_AVATARS_QUARK);
-@@ -873,36 +939,24 @@
- return;
- }
-
-- /* if the token is set, we have nothing to do */
-- if (!token && filename && g_file_test (filename, G_FILE_TEST_EXISTS))
-- {
-- gchar *data = NULL;
-- size_t length;
-- if (g_file_get_contents (filename, &data, &length, &error))
-- {
-- if (length > 0 && length < G_MAXUINT)
-- {
-- GArray avatar;
-- avatar.data = data;
-- avatar.len = (guint)length;
-- tp_conn_iface_avatars_set_avatar_async (priv->avatars_proxy,
-- &avatar, mime_type,
-- set_avatar_cb, priv);
-- }
-- else
-- tp_conn_iface_avatars_clear_avatar_async(priv->avatars_proxy,
-- clear_avatar_cb,
-- g_strdup (filename));
--
-- }
-- else
-- {
-- g_debug ("%s: error reading %s: %s", G_STRFUNC, filename, error->message);
-- g_error_free (error);
-- }
-- g_free(data);
-- }
--
-+ if (filename)
-+ {
-+ if (!token)
-+ _mcd_connection_set_avatar (priv, filename, mime_type);
-+ else
-+ {
-+ /* Set the avatar only if no other one was set */
-+ GArray *handles = g_array_sized_new (FALSE, FALSE,
-+ sizeof (guint), 1);
-+ g_array_append_val (handles, priv->self_handle);
-+ tp_conn_iface_avatars_get_known_avatar_tokens_async (
-+ priv->avatars_proxy,
-+ handles,
-+ request_tokens_cb,
-+ priv);
-+ g_array_free (handles, TRUE);
-+ }
-+ }
- g_free (filename);
- g_free (mime_type);
- g_free (token);
More information about the Pkg-telepathy-commits
mailing list