[Pkg-telepathy-commits] [SCM] telepathy-gabble packaging branch, debian, updated. debian/0.8.9-1-5-gd99732c
Jonny Lamb
jonny at debian.org
Mon Feb 8 18:53:36 UTC 2010
The following commit has been merged in the debian branch:
commit a2ed297a781a18055a49ac43f811fd90b1ab203a
Author: Jonny Lamb <jonny at debian.org>
Date: Mon Feb 8 17:26:38 2010 +0000
debian/patches/: Removed all patches from 0.8.9-1 as they're in this new release.
diff --git a/debian/changelog b/debian/changelog
index bb34f42..7b1976b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
telepathy-gabble (0.8.10-1) UNRELEASED; urgency=low
* New upstream release.
+ * debian/patches/:
+ + Removed all patches from 0.8.9-1 as they're in this new release.
- -- Jonny Lamb <jonny at debian.org> Mon, 08 Feb 2010 17:22:09 +0000
+ -- Jonny Lamb <jonny at debian.org> Mon, 08 Feb 2010 17:26:08 +0000
telepathy-gabble (0.8.9-1) unstable; urgency=low
diff --git a/debian/patches/0001-fd.o-25341-Always-sets-its-own-vcard-on-login.patch b/debian/patches/0001-fd.o-25341-Always-sets-its-own-vcard-on-login.patch
deleted file mode 100644
index 02c7329..0000000
--- a/debian/patches/0001-fd.o-25341-Always-sets-its-own-vcard-on-login.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From e4c771cc01554e641de699f89ed59ff000bb861c Mon Sep 17 00:00:00 2001
-From: Andre Moreira Magalhaes (andrunko) <andrunko at andrunko.cbg.collabora.co.uk>
-Date: Mon, 7 Dec 2009 11:04:16 -0300
-Subject: [PATCH 1/3] fd.o#25341: Always sets its own vcard on login
-
-Note that gmail only stores vcard fields FN and PHOTO, so when using empathy the
-nickname (alias) will be updated on every login.
----
- src/vcard-manager.c | 28 ++++++++++++++++++++++++++++
- 1 files changed, 28 insertions(+), 0 deletions(-)
-
-diff --git a/src/vcard-manager.c b/src/vcard-manager.c
-index c93332d..28601df 100644
---- a/src/vcard-manager.c
-+++ b/src/vcard-manager.c
-@@ -1000,6 +1000,27 @@ vcard_copy (LmMessageNode *parent, LmMessageNode *src)
- return new;
- }
-
-+static gboolean
-+check_vcard_changed (gpointer k, gpointer v, gpointer user_data)
-+{
-+ const gchar *key = k;
-+ const gchar *value = v;
-+ LmMessageNode *vcard_node = user_data;
-+ LmMessageNode *node;
-+
-+ node = lm_message_node_get_child (vcard_node, key);
-+ if (node != NULL)
-+ {
-+ const gchar *node_value = lm_message_node_get_value (node);
-+
-+ if (!tp_strdiff (node_value, value))
-+ return FALSE;
-+ }
-+
-+ DEBUG ("vcard node %s changed, vcard needs update", key);
-+ return TRUE;
-+}
-+
- static void
- manager_patch_vcard (GabbleVCardManager *self,
- LmMessageNode *vcard_node)
-@@ -1015,6 +1036,12 @@ manager_patch_vcard (GabbleVCardManager *self,
- if (priv->edits == NULL || priv->edit_pipeline_item != NULL)
- return;
-
-+ if (g_hash_table_find (priv->edits, check_vcard_changed, vcard_node) == NULL)
-+ {
-+ DEBUG ("nothing changed, not updating vcard");
-+ goto out;
-+ }
-+
- DEBUG("patching vcard");
-
- msg = lm_message_new_with_sub_type (NULL, LM_MESSAGE_TYPE_IQ,
-@@ -1036,6 +1063,7 @@ manager_patch_vcard (GabbleVCardManager *self,
-
- lm_message_unref (msg);
-
-+out:
- /* We've applied those, forget about them */
- g_hash_table_destroy (priv->edits);
- priv->edits = NULL;
diff --git a/debian/patches/0002-vcard-manager-Do-not-try-to-set-vcard-fields-not-sup.patch b/debian/patches/0002-vcard-manager-Do-not-try-to-set-vcard-fields-not-sup.patch
deleted file mode 100644
index fc140fe..0000000
--- a/debian/patches/0002-vcard-manager-Do-not-try-to-set-vcard-fields-not-sup.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From a01e7711ed97985d366302365f8764a8a02d6662 Mon Sep 17 00:00:00 2001
-From: Andre Moreira Magalhaes (andrunko) <andrunko at andrunko.cbg.collabora.co.uk>
-Date: Wed, 9 Dec 2009 14:04:42 -0300
-Subject: [PATCH 2/3] vcard-manager: Do not try to set vcard fields not supported by google servers.
-
----
- src/vcard-manager.c | 24 ++++++++++++++++++++++--
- 1 files changed, 22 insertions(+), 2 deletions(-)
-
-diff --git a/src/vcard-manager.c b/src/vcard-manager.c
-index 28601df..ee00ce1 100644
---- a/src/vcard-manager.c
-+++ b/src/vcard-manager.c
-@@ -1000,14 +1000,28 @@ vcard_copy (LmMessageNode *parent, LmMessageNode *src)
- return new;
- }
-
-+typedef struct {
-+ GabbleConnection *connection;
-+ LmMessageNode *vcard_node;
-+} CheckVCardContext;
-+
- static gboolean
- check_vcard_changed (gpointer k, gpointer v, gpointer user_data)
- {
- const gchar *key = k;
- const gchar *value = v;
-- LmMessageNode *vcard_node = user_data;
-+ CheckVCardContext *check_vcard_ctx = user_data;
-+ GabbleConnection *conn = check_vcard_ctx->connection;
-+ LmMessageNode *vcard_node = check_vcard_ctx->vcard_node;
- LmMessageNode *node;
-
-+ if (conn->features & GABBLE_CONNECTION_FEATURES_GOOGLE_ROSTER &&
-+ strcmp (key, "N") != 0 && strcmp (key, "FN") != 0 &&
-+ strcmp (key, "PHOTO") != 0)
-+ {
-+ return FALSE;
-+ }
-+
- node = lm_message_node_get_child (vcard_node, key);
- if (node != NULL)
- {
-@@ -1029,6 +1043,7 @@ manager_patch_vcard (GabbleVCardManager *self,
- LmMessage *msg;
- LmMessageNode *patched_vcard;
- GList *li;
-+ CheckVCardContext *check_vcard_ctx;
-
- /* Bail out if we don't have outstanding edits to make, or if we already
- * have a set request in progress.
-@@ -1036,7 +1051,10 @@ manager_patch_vcard (GabbleVCardManager *self,
- if (priv->edits == NULL || priv->edit_pipeline_item != NULL)
- return;
-
-- if (g_hash_table_find (priv->edits, check_vcard_changed, vcard_node) == NULL)
-+ check_vcard_ctx = g_new (CheckVCardContext, 1);
-+ check_vcard_ctx->connection = priv->connection;
-+ check_vcard_ctx->vcard_node = vcard_node;
-+ if (g_hash_table_find (priv->edits, check_vcard_changed, check_vcard_ctx) == NULL)
- {
- DEBUG ("nothing changed, not updating vcard");
- goto out;
-@@ -1064,6 +1082,8 @@ manager_patch_vcard (GabbleVCardManager *self,
- lm_message_unref (msg);
-
- out:
-+ g_free (check_vcard_ctx);
-+
- /* We've applied those, forget about them */
- g_hash_table_destroy (priv->edits);
- priv->edits = NULL;
diff --git a/debian/patches/0003-vcard-manager-Iterate-over-hashtable-instead-of-usin.patch b/debian/patches/0003-vcard-manager-Iterate-over-hashtable-instead-of-usin.patch
deleted file mode 100644
index 60a0e96..0000000
--- a/debian/patches/0003-vcard-manager-Iterate-over-hashtable-instead-of-usin.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 6874f37f2f3b80fb0840565fe1dbe13559a529fb Mon Sep 17 00:00:00 2001
-From: Andre Moreira Magalhaes (andrunko) <andrunko at andrunko.cbg.collabora.co.uk>
-Date: Wed, 9 Dec 2009 14:15:48 -0300
-Subject: [PATCH 3/3] vcard-manager: Iterate over hashtable instead of usin g_hash_table_find to check if vcard changed.
-
----
- src/vcard-manager.c | 36 ++++++++++++++++++------------------
- 1 files changed, 18 insertions(+), 18 deletions(-)
-
-diff --git a/src/vcard-manager.c b/src/vcard-manager.c
-index ee00ce1..9ccd633 100644
---- a/src/vcard-manager.c
-+++ b/src/vcard-manager.c
-@@ -1000,19 +1000,12 @@ vcard_copy (LmMessageNode *parent, LmMessageNode *src)
- return new;
- }
-
--typedef struct {
-- GabbleConnection *connection;
-- LmMessageNode *vcard_node;
--} CheckVCardContext;
--
- static gboolean
--check_vcard_changed (gpointer k, gpointer v, gpointer user_data)
-+vcard_node_changed (GabbleConnection *conn,
-+ const gchar *key,
-+ const gchar *value,
-+ LmMessageNode *vcard_node)
- {
-- const gchar *key = k;
-- const gchar *value = v;
-- CheckVCardContext *check_vcard_ctx = user_data;
-- GabbleConnection *conn = check_vcard_ctx->connection;
-- LmMessageNode *vcard_node = check_vcard_ctx->vcard_node;
- LmMessageNode *node;
-
- if (conn->features & GABBLE_CONNECTION_FEATURES_GOOGLE_ROSTER &&
-@@ -1043,7 +1036,9 @@ manager_patch_vcard (GabbleVCardManager *self,
- LmMessage *msg;
- LmMessageNode *patched_vcard;
- GList *li;
-- CheckVCardContext *check_vcard_ctx;
-+ GHashTableIter iter;
-+ gpointer key, value;
-+ gboolean vcard_changed = FALSE;
-
- /* Bail out if we don't have outstanding edits to make, or if we already
- * have a set request in progress.
-@@ -1051,10 +1046,17 @@ manager_patch_vcard (GabbleVCardManager *self,
- if (priv->edits == NULL || priv->edit_pipeline_item != NULL)
- return;
-
-- check_vcard_ctx = g_new (CheckVCardContext, 1);
-- check_vcard_ctx->connection = priv->connection;
-- check_vcard_ctx->vcard_node = vcard_node;
-- if (g_hash_table_find (priv->edits, check_vcard_changed, check_vcard_ctx) == NULL)
-+ g_hash_table_iter_init (&iter, priv->edits);
-+ while (g_hash_table_iter_next (&iter, &key, &value))
-+ {
-+ if (vcard_node_changed (priv->connection, key, value, vcard_node))
-+ {
-+ vcard_changed = TRUE;
-+ break;
-+ }
-+ }
-+
-+ if (!vcard_changed)
- {
- DEBUG ("nothing changed, not updating vcard");
- goto out;
-@@ -1082,8 +1084,6 @@ manager_patch_vcard (GabbleVCardManager *self,
- lm_message_unref (msg);
-
- out:
-- g_free (check_vcard_ctx);
--
- /* We've applied those, forget about them */
- g_hash_table_destroy (priv->edits);
- priv->edits = NULL;
--
telepathy-gabble packaging
More information about the Pkg-telepathy-commits
mailing list