From d7aee7e7edfe1d76beba4246f50510479af955a7 Mon Sep 17 00:00:00 2001
From: Chris Toshok <toshok@ximian.com>
Date: Tue, 12 Nov 2002 04:01:10 +0000
Subject: change signature to that of a weak ref notify function. (main):
 ::destroy

2002-11-11  Chris Toshok  <toshok@ximian.com>

	* gui/widgets/test-reflow.c (destroy_callback): change signature
	to that of a weak ref notify function.
	(main): ::destroy -> weak_ref.

	* gui/widgets/test-minicard.c (destroy_callback): change signature
	to that of a weak ref notify function.
	(main): ::destroy -> weak_ref.

	* gui/widgets/test-minicard-view.c (destroy_callback): change
	signature to that of a weak ref notify function.
	(main): ::destroy -> weak_ref.

	* gui/widgets/test-minicard-label.c (destroy_callback): change
	signature to that of a weak ref notify function.
	(main): ::destroy -> weak_ref.

	* gui/widgets/e-minicard-widget.c (e_minicard_widget_init): ifdef
	out the call to gnome_canvas_set_scroll_region.  It doesn't seem
	necessary judging from the rest of the code, and it also crashes
	the addressbook if it's in.

	* gui/widgets/e-minicard-widget-test.c (destroy_callback): change
	signature to that of a weak ref notify function.
	(main): ::destroy -> weak_ref.

	* gui/widgets/e-minicard-control.c (free_struct): change signature
	to that of a weak ref notify function.
	(e_minicard_control_factory): ::destroy -> weak_ref.

	* gui/widgets/e-addressbook-view.c (e_addressbook_view_init):
	::destroy -> weak_ref.
	(e_addressbook_view_print): same.
	(free_closure): change signature to that of a weak ref notify
	function.
	(e_contact_print_destroy): same.
	(invisible_destroyed): same.

	* gui/widgets/e-addressbook-util.c
	(e_addressbook_prompt_save_dialog): convert from GnomeDialog to
	GtkDialog.
	(e_addressbook_show_multiple_cards): same.

	* gui/contact-list-editor/e-contact-list-editor.c
	(prompt_to_save_changes): change response ids to use
	GTK_RESPONSE_.

	* gui/component/select-names/e-select-names-manager.c
	(clear_widget): new function.
	(e_select_names_manager_activate_dialog): ::destroy -> weak_ref.

	* gui/component/select-names/e-select-names.c (clear_widget):
	change signature to that of a weak ref notify function.
	(e_select_names_init): ::destroy -> weak_ref.

	* gui/component/e-address-popup.c (mini_wizard_destroy_cb): change
	signature to that of a weak ref notify function.
	(mini_wizard_new): ::destroy -> weak_ref.

	* gui/component/addressbook-config.c
	(addressbook_source_dialog_destroy): change signature to that of a
	weak ref notify function.
	(ldap_config_control_destroy_callback): same.
	(addressbook_add_server_druid): ::destroy -> weak_ref.
	(addressbook_edit_server_dialog): same.
	(ldap_config_control_new): same.

	* gui/component/addressbook.c (destroy_callback): change signature
	to that of a a weak ref notify function.
	(addressbook_factory_new_control): ::destroy -> weak_ref.

	* gui/merging/e-card-merging.c (response): rename clicked to this,
	and destroy the dialog here.
	(match_query_callback): ::clicked -> ::response

	* gui/merging/e-card-merging-book-commit-duplicate-detected.glade:
	convert.

	* gui/merging/e-card-duplicate-detected.glade: same.

svn path=/trunk/; revision=18719
---
 addressbook/gui/merging/e-card-merging.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'addressbook/gui/merging/e-card-merging.c')

diff --git a/addressbook/gui/merging/e-card-merging.c b/addressbook/gui/merging/e-card-merging.c
index 28357f2f58..1b3da3e063 100644
--- a/addressbook/gui/merging/e-card-merging.c
+++ b/addressbook/gui/merging/e-card-merging.c
@@ -11,7 +11,6 @@
 #include <config.h>
 
 #include "e-card-merging.h"
-#include <libgnomeui/gnome-dialog.h>
 #include <ebook/e-card-compare.h>
 #include <glade/glade.h>
 #include <gtk/gtksignal.h>
@@ -53,9 +52,11 @@ cancelit (ECardMergingLookup *lookup)
 }
 
 static void
-clicked (GnomeDialog *dialog, int button, ECardMergingLookup *lookup)
+response (GtkWidget *dialog, int response, ECardMergingLookup *lookup)
 {
-	switch (button) {
+	gtk_widget_destroy (dialog);
+
+	switch (response) {
 	case 0:
 		doit (lookup);
 		break;
@@ -64,7 +65,6 @@ clicked (GnomeDialog *dialog, int button, ECardMergingLookup *lookup)
 		break;
 	}
 	g_free (lookup);
-	gnome_dialog_close (dialog);
 }
 
 static void
@@ -102,8 +102,10 @@ match_query_callback (ECard *card, ECard *match, ECardMatchType type, gpointer c
 
 		widget = glade_xml_get_widget (ui, "dialog-duplicate-contact");
 
-		g_signal_connect (widget, "clicked",
-				  G_CALLBACK (clicked), lookup);
+		g_signal_connect (widget, "response",
+				  G_CALLBACK (response), lookup);
+
+		gtk_widget_show_all (widget);
 	}
 }
 
-- 
cgit