diff options
| author | Ankit Vani <a@nevitus.org> | 2013-10-08 10:10:15 +0530 |
|---|---|---|
| committer | Ankit Vani <a@nevitus.org> | 2013-10-08 10:10:15 +0530 |
| commit | 92b94fe88998acf6e17ce1c78817473ef6dadfa3 (patch) | |
| tree | 64f7f5d200c45fcf19a4ac1bdf26d05215eafb0d /pidgin | |
| parent | 80cba9c5e4547474d6dcc398a62431ed982d1a97 (diff) | |
| parent | 93014ea5494fce4d0a7ab3587db2d042e36d98cf (diff) | |
| download | pidgin-92b94fe88998acf6e17ce1c78817473ef6dadfa3.tar.gz | |
Merged default branch
Diffstat (limited to 'pidgin')
| -rw-r--r-- | pidgin/gtkdialogs.c | 2 | ||||
| -rw-r--r-- | pidgin/gtkwebview.c | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/pidgin/gtkdialogs.c b/pidgin/gtkdialogs.c index ec6dbe0a35..ca1dac195b 100644 --- a/pidgin/gtkdialogs.c +++ b/pidgin/gtkdialogs.c @@ -172,7 +172,6 @@ static const struct translator translators[] = { {N_("Danish"), "da", "Peter Bach", "bach.peter@gmail.com"}, {NULL, NULL, "Morten Brix Pedersen", "morten@wtf.dk"}, {N_("German"), "de", "Björn Voigt", "bjoernv@arcor.de"}, - {NULL, NULL, "Jochen Kemnade", "jochenkemnade@web.de"}, {N_("Dzongkha"), "dz", "Norbu", "nor_den@hotmail.com"}, {NULL, NULL, "Jurmey Rabgay", "jur_gay@yahoo.com"}, {NULL, NULL, "Wangmo Sherpa", "rinwanshe@yahoo.com"}, @@ -278,6 +277,7 @@ static const struct translator past_translators[] = { {NULL, NULL, "Miloslav Trmac", "mitr@volny.cz"}, {N_("German"), "de", "Daniel Seifert", NULL}, {NULL, NULL, "Karsten Weiss", NULL}, + {NULL, NULL, "Jochen Kemnade", "jochenkemnade@web.de"}, {N_("British English"), "en_GB", "Luke Ross", "luke@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 index 83485160bd..3f69d9728b 100644 --- a/pidgin/gtkwebview.c +++ b/pidgin/gtkwebview.c @@ -846,6 +846,15 @@ webview_inspector_inspect_element(GtkWidget *item, GtkWebViewInspectData *data) 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(WebKitWebInspector *inspector, 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; } |