Merge lp:~nomad-p/midori/fix-bug1182603 into lp:midori

[Stephan Haller]

Do not run toolbar editor's GtkDialog in its own main loop by prevent calling gtk_dialog_run(). Instead just set the GtkDialog modal and show it.

Fixes bug #1182603:
midori becomes inresponsive when cookie bar pops up whilewhile the toolbar editor is open

[André Stösel (ivaldi)]

Works fine now, thank you!

review: Approve

=== modified file 'extensions/toolbar-editor.c'
--- extensions/toolbar-editor.c	2013-03-26 08:01:24 +0000
+++ extensions/toolbar-editor.c	2013-06-02 02:34:25 +0000
@@ -32,6 +32,12 @@
 	MidoriBrowser *browser;
 } TBEditorWidget;
 
+typedef struct
+{
+	GSList *used_items, *all_items;
+	TBEditorWidget *tbw;
+} TBEditorWindow;
+
 enum
 {
 	TB_EDITOR_COL_ACTION,
@@ -40,6 +46,8 @@
 	TB_EDITOR_COLS_MAX
 };
 
+static TBEditorWindow	*tbe_window=NULL;
+
 static const GtkTargetEntry tb_editor_dnd_targets[] =
 {
 	{ "MIDORI_TB_EDITOR_ROW", 0, 0 }
@@ -514,64 +522,81 @@
 	return tbw;
 }
 
+static void tb_editor_response_cb(GtkWidget* inDialog,
+									gint inResponse,
+									gpointer inUserData)
+{
+	gtk_widget_destroy(tbe_window->tbw->dialog);
+
+	g_slist_foreach(tbe_window->used_items, (GFunc) g_free, NULL);
+	g_slist_foreach(tbe_window->all_items, (GFunc) g_free, NULL);
+	g_slist_free(tbe_window->used_items);
+	g_slist_free(tbe_window->all_items);
+	tb_editor_free_path(tbe_window->tbw);
+	g_free(tbe_window->tbw);
+
+	g_free(tbe_window);
+	tbe_window=NULL;
+}
 
 static void tb_editor_menu_configure_toolbar_activate_cb(GtkWidget *menuitem, MidoriBrowser *browser)
 {
-	GSList *node, *used_items, *all_items;
-	GtkTreeIter iter;
-	GtkTreePath *path;
-	TBEditorWidget *tbw;
-
-	/* read the current active toolbar items */
-	used_items = tb_editor_parse_active_items(browser);
-
-	/* get all available actions */
-	all_items = tb_editor_get_available_actions(browser);
-
-	/* create the GUI */
-	tbw = tb_editor_create_dialog(browser);
-
-	/* cache some pointers, this is safe enough since the dialog is run modally */
-	tbw->action_group = midori_browser_get_action_group(browser);
-	tbw->browser = browser;
-
-	/* fill the stores */
-	for (node = all_items; node != NULL; node = node->next)
-	{
-		if (strcmp(node->data, "Separator") == 0 ||
-			g_slist_find_custom(used_items, node->data, (GCompareFunc) strcmp) == NULL)
-		{
-			gtk_list_store_append(tbw->store_available, &iter);
-			tb_editor_set_item_values(tbw, node->data, tbw->store_available, &iter);
-		}
-	}
-	for (node = used_items; node != NULL; node = node->next)
-	{
-		gtk_list_store_append(tbw->store_used, &iter);
-		tb_editor_set_item_values(tbw, node->data, tbw->store_used, &iter);
-	}
-	/* select first item */
-	path = gtk_tree_path_new_from_string("0");
-	gtk_tree_selection_select_path(gtk_tree_view_get_selection(tbw->tree_used), path);
-	gtk_tree_path_free(path);
-
-	/* connect the changed signals after populating the store */
-	g_signal_connect(tbw->store_used, "row-changed",
-		G_CALLBACK(tb_editor_available_items_changed_cb), tbw);
-	g_signal_connect(tbw->store_used, "row-deleted",
-		G_CALLBACK(tb_editor_available_items_deleted_cb), tbw);
-
-	/* run it */
-	gtk_dialog_run(GTK_DIALOG(tbw->dialog));
-
-	gtk_widget_destroy(tbw->dialog);
-
-	g_slist_foreach(used_items, (GFunc) g_free, NULL);
-	g_slist_foreach(all_items, (GFunc) g_free, NULL);
-	g_slist_free(used_items);
-	g_slist_free(all_items);
-	tb_editor_free_path(tbw);
-	g_free(tbw);
+	/* create toolbar-editor window if not available */
+	if(tbe_window==NULL)
+	{
+		GSList *node;
+		GtkTreeIter iter;
+		GtkTreePath *path;
+
+		/* create storage for window data */
+		tbe_window=g_new0(TBEditorWindow, 1);
+
+		/* read the current active toolbar items */
+		tbe_window->used_items = tb_editor_parse_active_items(browser);
+
+		/* get all available actions */
+		tbe_window->all_items = tb_editor_get_available_actions(browser);
+
+		/* create the GUI */
+		tbe_window->tbw = tb_editor_create_dialog(browser);
+
+		/* cache some pointers, this is safe enough since the dialog is run modally */
+		tbe_window->tbw->action_group = midori_browser_get_action_group(browser);
+		tbe_window->tbw->browser = browser;
+
+		/* fill the stores */
+		for (node = tbe_window->all_items; node != NULL; node = node->next)
+		{
+			if (strcmp(node->data, "Separator") == 0 ||
+				g_slist_find_custom(tbe_window->used_items, node->data, (GCompareFunc) strcmp) == NULL)
+			{
+				gtk_list_store_append(tbe_window->tbw->store_available, &iter);
+				tb_editor_set_item_values(tbe_window->tbw, node->data, tbe_window->tbw->store_available, &iter);
+			}
+		}
+		for (node = tbe_window->used_items; node != NULL; node = node->next)
+		{
+			gtk_list_store_append(tbe_window->tbw->store_used, &iter);
+			tb_editor_set_item_values(tbe_window->tbw, node->data, tbe_window->tbw->store_used, &iter);
+		}
+		/* select first item */
+		path = gtk_tree_path_new_from_string("0");
+		gtk_tree_selection_select_path(gtk_tree_view_get_selection(tbe_window->tbw->tree_used), path);
+		gtk_tree_path_free(path);
+
+		/* connect the changed signals after populating the store */
+		g_signal_connect(tbe_window->tbw->store_used, "row-changed",
+			G_CALLBACK(tb_editor_available_items_changed_cb), tbe_window->tbw);
+		g_signal_connect(tbe_window->tbw->store_used, "row-deleted",
+			G_CALLBACK(tb_editor_available_items_deleted_cb), tbe_window->tbw);
+
+		/* connect signal for detecting window close */
+		g_signal_connect(tbe_window->tbw->dialog, "response", G_CALLBACK (tb_editor_response_cb), NULL);
+	}
+
+	/* show dialog and make it modal */
+	gtk_window_set_modal(GTK_WINDOW(tbe_window->tbw->dialog), TRUE);
+	gtk_widget_show_all(tbe_window->tbw->dialog);
 }
 
 static void tb_editor_browser_populate_toolbar_menu_cb(MidoriBrowser *browser, GtkWidget *menu,