[Xfce4-commits] <midori:master> Use g_signal_connect_swapped with gtk_widget_destroy
Christian Dywan
noreply at xfce.org
Sat Feb 2 02:16:01 CET 2013
Updating branch refs/heads/master
to 3611f1ba163e6be2c879fe4cd7cc7c6e02ce3d0e (commit)
from 453a38b93dc710f4895270bf38f525aa0942fb5f (commit)
commit 3611f1ba163e6be2c879fe4cd7cc7c6e02ce3d0e
Author: Christian Dywan <christian at twotoasts.de>
Date: Sat Feb 2 02:00:48 2013 +0100
Use g_signal_connect_swapped with gtk_widget_destroy
extensions/adblock.c | 12 ++----------
extensions/feed-panel/main.c | 12 ++----------
extensions/shortcuts.c | 12 ++----------
midori/midori-searchaction.c | 12 ++----------
midori/midori-view.c | 12 ++----------
midori/sokoke.c | 12 ++----------
6 files changed, 12 insertions(+), 60 deletions(-)
diff --git a/extensions/adblock.c b/extensions/adblock.c
index 97a7b93..395dd7b 100644
--- a/extensions/adblock.c
+++ b/extensions/adblock.c
@@ -452,14 +452,6 @@ adblock_activate_link_cb (GtkWidget* label,
}
#endif
-static void
-adblock_preferences_response_cb (GtkWidget* dialog,
- gint response,
- gpointer data)
-{
- gtk_widget_destroy (dialog);
-}
-
static GtkWidget*
adblock_get_preferences_dialog (MidoriExtension* extension)
{
@@ -508,8 +500,8 @@ adblock_get_preferences_dialog (MidoriExtension* extension)
GTK_RESPONSE_HELP, FALSE);
sokoke_widget_get_text_size (dialog, "M", &width, &height);
gtk_window_set_default_size (GTK_WINDOW (dialog), width * 52, -1);
- g_signal_connect (dialog, "response",
- G_CALLBACK (adblock_preferences_response_cb), NULL);
+ g_signal_connect_swapped (dialog, "response",
+ G_CALLBACK (gtk_widget_destroy), dialog);
/* TODO: We need mnemonics */
if ((xfce_heading = sokoke_xfce_header_new (
gtk_window_get_icon_name (GTK_WINDOW (dialog)), dialog_title)))
diff --git a/extensions/feed-panel/main.c b/extensions/feed-panel/main.c
index bff7bd9..7d8b89e 100644
--- a/extensions/feed-panel/main.c
+++ b/extensions/feed-panel/main.c
@@ -101,14 +101,6 @@ feed_deactivate_cb (MidoriExtension* extension,
}
}
-static void
-feed_dialog_response_cb (GtkWidget* dialog,
- gint response,
- gpointer data)
-{
- gtk_widget_destroy (dialog);
-}
-
static KatzeArray*
feed_add_item (KatzeArray* feeds,
const gchar* uri)
@@ -130,8 +122,8 @@ feed_add_item (KatzeArray* feeds,
_("Feed '%s' already exists"), uri);
gtk_window_set_title (GTK_WINDOW (dialog), EXTENSION_NAME);
gtk_widget_show (dialog);
- g_signal_connect (dialog, "response",
- G_CALLBACK (feed_dialog_response_cb), NULL);
+ g_signal_connect_swapped (dialog, "response",
+ G_CALLBACK (gtk_widget_destroy), dialog);
}
else
diff --git a/extensions/shortcuts.c b/extensions/shortcuts.c
index b4cb042..d2ad909 100644
--- a/extensions/shortcuts.c
+++ b/extensions/shortcuts.c
@@ -137,14 +137,6 @@ shortcuts_hotkey_for_action (GtkAction* action,
return FALSE;
}
-static void
-shortcuts_preferences_response_cb (GtkWidget* dialog,
- gint response,
- gpointer data)
-{
- gtk_widget_destroy (dialog);
-}
-
static GtkWidget*
shortcuts_get_preferences_dialog (MidoriExtension* extension)
{
@@ -183,8 +175,8 @@ shortcuts_get_preferences_dialog (MidoriExtension* extension)
gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_PROPERTIES);
sokoke_widget_get_text_size (dialog, "M", &width, &height);
gtk_window_set_default_size (GTK_WINDOW (dialog), width * 52, height * 24);
- g_signal_connect (dialog, "response",
- G_CALLBACK (shortcuts_preferences_response_cb), NULL);
+ g_signal_connect_swapped (dialog, "response",
+ G_CALLBACK (gtk_widget_destroy), dialog);
dialog_vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
if ((xfce_heading = sokoke_xfce_header_new (
diff --git a/midori/midori-searchaction.c b/midori/midori-searchaction.c
index 7cdee9a..82fa2bf 100644
--- a/midori/midori-searchaction.c
+++ b/midori/midori-searchaction.c
@@ -1364,14 +1364,6 @@ midori_search_action_treeview_destroy_cb (GtkWidget* treeview,
}
}
-static void
-midori_search_action_dialog_respnse_cb (GtkWidget* dialog,
- gint response,
- gpointer data)
-{
- gtk_widget_destroy (dialog);
-}
-
/**
* midori_search_action_get_dialog:
* @search_action: a #MidoriSearchAction
@@ -1435,8 +1427,8 @@ midori_search_action_get_dialog (MidoriSearchAction* search_action)
GTK_RESPONSE_HELP, FALSE);
sokoke_widget_get_text_size (dialog, "M", &width, &height);
gtk_window_set_default_size (GTK_WINDOW (dialog), width * 52, -1);
- g_signal_connect (dialog, "response",
- G_CALLBACK (midori_search_action_dialog_respnse_cb), NULL);
+ g_signal_connect_swapped (dialog, "response",
+ G_CALLBACK (gtk_widget_destroy), dialog);
/* TODO: Do we want tooltips for explainations or can we omit that?
We need mnemonics */
if ((xfce_heading = sokoke_xfce_header_new (
diff --git a/midori/midori-view.c b/midori/midori-view.c
index 1a1f986..e0de4ff 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -5160,14 +5160,6 @@ midori_view_print_create_custom_widget_cb (GtkPrintOperation* operation,
return box;
}
-static void
-midori_view_print_response_cb (GtkWidget* dialog,
- gint response,
- gpointer data)
-{
- gtk_widget_destroy (dialog);
-}
-
/**
* midori_view_print
* @view: a #MidoriView
@@ -5205,8 +5197,8 @@ midori_view_print (MidoriView* view)
GTK_BUTTONS_CLOSE, "%s", error->message);
g_error_free (error);
- g_signal_connect (dialog, "response",
- G_CALLBACK (midori_view_print_response_cb), NULL);
+ g_signal_connect_swapped (dialog, "response",
+ G_CALLBACK (gtk_widget_destroy), dialog);
gtk_widget_show (dialog);
}
}
diff --git a/midori/sokoke.c b/midori/sokoke.c
index bb62ac1..90cddc8 100644
--- a/midori/sokoke.c
+++ b/midori/sokoke.c
@@ -98,14 +98,6 @@ sokoke_js_script_eval (JSContextRef js_context,
return value;
}
-static void
-sokoke_message_dialog_response_cb (GtkWidget* dialog,
- gint response,
- gpointer data)
-{
- gtk_widget_destroy (dialog);
-}
-
void
sokoke_message_dialog (GtkMessageType message_type,
const gchar* short_message,
@@ -123,8 +115,8 @@ sokoke_message_dialog (GtkMessageType message_type,
}
else
{
- g_signal_connect (dialog, "response",
- G_CALLBACK (sokoke_message_dialog_response_cb), NULL);
+ g_signal_connect_swapped (dialog, "response",
+ G_CALLBACK (gtk_widget_destroy), dialog);
gtk_widget_show (dialog);
}
More information about the Xfce4-commits
mailing list