/soc/2013/ankitkv/gobjectification: 8f0364b2e49a: Merged default...

[Ankit Vani]

Changeset: 8f0364b2e49a806e03a7e88cff940b480427a4dd
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-10-08 10:10 +0530
Branch:	 soc.2013.gobjectification
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/8f0364b2e49a

Description:

Merged default branch

diffstat:

 pidgin/gtkdialogs.c |   2 +-
 pidgin/gtkwebview.c |  12 ++++++++++++
 po/de.po            |   3 ++-
 3 files changed, 15 insertions(+), 2 deletions(-)

diffs (62 lines):

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
@@ -846,6 +846,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)
@@ -863,6 +872,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.
 #