/dev/tomkiewicz/e2ee: 6f22f282a8cf: Merge default
Tomasz Wasilczyk
twasilczyk at pidgin.im
Fri Oct 11 06:46:02 EDT 2013
Changeset: 6f22f282a8cfcb087e068f1ecc2c84d1a18a6301
Author: Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date: 2013-10-11 12:45 +0200
Branch: default
URL: https://hg.pidgin.im/dev/tomkiewicz/e2ee/rev/6f22f282a8cf
Description:
Merge default
diffstat:
libpurple/protocols/gg/chat.c | 6 +++---
libpurple/protocols/gg/gg.c | 16 +++++++++++++++-
libpurple/protocols/gg/tcpsocket.c | 8 ++++----
pidgin/gtkdialogs.c | 2 +-
pidgin/gtkwebview.c | 12 ++++++++++++
po/de.po | 3 ++-
6 files changed, 37 insertions(+), 10 deletions(-)
diffs (153 lines):
diff --git a/libpurple/protocols/gg/chat.c b/libpurple/protocols/gg/chat.c
--- a/libpurple/protocols/gg/chat.c
+++ b/libpurple/protocols/gg/chat.c
@@ -368,7 +368,7 @@ void ggp_chat_join(PurpleConnection *gc,
char *buff = g_strdup_printf(
_("%s is not a valid room identifier"), id_cs);
purple_notify_error(gc, _("Invalid Room Identifier"),
- _("Invalid Room Identifier"), buff);
+ _("Invalid Room Identifier"), buff, NULL);
g_free(buff);
purple_serv_got_join_chat_failed(gc, components);
return;
@@ -403,7 +403,7 @@ static void ggp_chat_join_id(PurpleConne
_("%s is not a valid room identifier"), id_s);
g_free(id_s);
purple_notify_error(gc, _("Invalid Room Identifier"),
- _("Invalid Room Identifier"), buff);
+ _("Invalid Room Identifier"), buff, NULL);
g_free(buff);
}
else /* if (chat->left) */
@@ -411,7 +411,7 @@ static void ggp_chat_join_id(PurpleConne
purple_notify_error(gc, _("Could not join chat room"),
_("Could not join chat room"),
_("You have to ask for invitation from another chat "
- "participant"));
+ "participant"), NULL);
}
components = ggp_chat_info_defaults(gc, ggp_chat_get_name_from_id(id));
diff --git a/libpurple/protocols/gg/gg.c b/libpurple/protocols/gg/gg.c
--- a/libpurple/protocols/gg/gg.c
+++ b/libpurple/protocols/gg/gg.c
@@ -321,6 +321,18 @@ static void ggp_callback_recv(gpointer _
return;
}
+#if GGP_ENABLE_GG11
+ if (purple_debug_is_verbose()) {
+ purple_debug_misc("gg", "ggp_callback_recv: got event %s",
+ gg_debug_event(ev->type));
+ }
+#endif
+
+ purple_input_remove(info->inpa);
+ info->inpa = purple_input_add(info->session->fd,
+ ggp_tcpsocket_inputcond_gg_to_purple(info->session->check),
+ ggp_callback_recv, gc);
+
switch (ev->type) {
case GG_EVENT_NONE:
/* Nothing happened. */
@@ -333,10 +345,11 @@ static void ggp_callback_recv(gpointer _
case GG_EVENT_MSG:
ggp_message_got(gc, &ev->event.msg);
break;
+ case GG_EVENT_ACK:
#if GGP_ENABLE_GG11
case GG_EVENT_ACK110:
+#endif
break;
-#endif
case GG_EVENT_IMAGE_REPLY:
ggp_image_recv(gc, &ev->event.image_reply);
break;
@@ -738,6 +751,7 @@ static void ggp_login(PurpleAccount *acc
glp->protocol_version = GG_PROTOCOL_VERSION_100;
else if (g_strcmp0(protocol_version, "gg11") == 0)
glp->protocol_version = GG_PROTOCOL_VERSION_110;
+ glp->compatibility = GG_COMPAT_1_12_0;
#else
glp->protocol_version = 0x2e;
#endif
diff --git a/libpurple/protocols/gg/tcpsocket.c b/libpurple/protocols/gg/tcpsocket.c
--- a/libpurple/protocols/gg/tcpsocket.c
+++ b/libpurple/protocols/gg/tcpsocket.c
@@ -86,10 +86,10 @@ ggp_tcpsocket_setup(PurpleConnection *gc
glp->socket_manager_type = purple_ssl_is_supported() ?
GG_SOCKET_MANAGER_TYPE_TLS : GG_SOCKET_MANAGER_TYPE_TCP;
glp->socket_manager.cb_data = gc;
- glp->socket_manager.connect = ggp_tcpsocket_connect;
- glp->socket_manager.close = ggp_tcpsocket_close;
- glp->socket_manager.read = ggp_tcpsocket_read;
- glp->socket_manager.write = ggp_tcpsocket_write;
+ glp->socket_manager.connect_cb = ggp_tcpsocket_connect;
+ glp->socket_manager.close_cb = ggp_tcpsocket_close;
+ glp->socket_manager.read_cb = ggp_tcpsocket_read;
+ glp->socket_manager.write_cb = ggp_tcpsocket_write;
}
#else
diff --git a/pidgin/gtkdialogs.c b/pidgin/gtkdialogs.c
--- a/pidgin/gtkdialogs.c
+++ b/pidgin/gtkdialogs.c
@@ -172,7 +172,6 @@ static const struct translator translato
{N_("Danish"), "da", "Peter Bach", "bach.peter at gmail.com"},
{NULL, NULL, "Morten Brix Pedersen", "morten at wtf.dk"},
{N_("German"), "de", "Björn Voigt", "bjoernv at arcor.de"},
- {NULL, NULL, "Jochen Kemnade", "jochenkemnade at web.de"},
{N_("Dzongkha"), "dz", "Norbu", "nor_den at hotmail.com"},
{NULL, NULL, "Jurmey Rabgay", "jur_gay at yahoo.com"},
{NULL, NULL, "Wangmo Sherpa", "rinwanshe at yahoo.com"},
@@ -278,6 +277,7 @@ static const struct translator past_tran
{NULL, NULL, "Miloslav Trmac", "mitr at volny.cz"},
{N_("German"), "de", "Daniel Seifert", NULL},
{NULL, NULL, "Karsten Weiss", NULL},
+ {NULL, NULL, "Jochen Kemnade", "jochenkemnade at web.de"},
{N_("British English"), "en_GB", "Luke Ross", "luke at lukeross.name"},
{N_("Spanish"), "es", "JM Pérez Cáncer", NULL},
{NULL, NULL, "Nicolás Lichtmaier", NULL},
diff --git a/pidgin/gtkwebview.c b/pidgin/gtkwebview.c
--- a/pidgin/gtkwebview.c
+++ b/pidgin/gtkwebview.c
@@ -882,6 +882,15 @@ webview_inspector_inspect_element(GtkWid
webkit_web_inspector_inspect_node(data->inspector, data->node);
}
+static void
+webview_inspector_destroy(GtkWindow *window, GtkWebViewPriv *priv)
+{
+ g_return_if_fail(priv->inspector_win == window);
+
+ priv->inspector_win = NULL;
+ priv->inspector_view = NULL;
+}
+
static WebKitWebView *
webview_inspector_create(WebKitWebInspector *inspector,
WebKitWebView *webview, gpointer _unused)
@@ -899,6 +908,9 @@ webview_inspector_create(WebKitWebInspec
gtk_container_add(GTK_CONTAINER(priv->inspector_win),
GTK_WIDGET(priv->inspector_view));
+ g_signal_connect(priv->inspector_win, "destroy",
+ G_CALLBACK(webview_inspector_destroy), priv);
+
return priv->inspector_view;
}
diff --git a/po/de.po b/po/de.po
--- a/po/de.po
+++ b/po/de.po
@@ -2,8 +2,9 @@
# Pidgin German translation
# Copyright (C) 2001, Daniel Seifert <Pidgin-translation at dseifert.de>
# Copyright (C) 2002, Karsten Weiss <knweiss at gmx.de>
-# Copyright (C) 2002-2013, Björn Voigt <bjoern at cs.tu-berlin.de>,
+# Copyright (C) 2002-2013, Björn Voigt <bjoernv at arcor.de>,
# Jochen Kemnade <jochenkemnade at web.de>
+# Copyright (C) 2013, Björn Voigt <bjoernv at arcor.de>,
#
# This file is distributed under the same license as the Pidgin package.
#
More information about the Commits
mailing list