[claws-mail-cvs-commit] addrgather.c

Update of /srv/cvs/claws-mail/claws/src
In directory ran:/tmp/cvs-serv5147/src

Modified Files:
      Tag: gtk2
	addrgather.c prefs_common.c prefs_common.h 
Log Message:
2009-10-07 [paul]	3.7.2cvs48

	* src/addrgather.c
	* src/prefs_common.c
	* src/prefs_common.h
		fix  Bug 2003 -  Address gathering dialog minor bugs/annoyances,
		patch by Pawel Pekala 

Index: prefs_common.c
===================================================================
RCS file: /srv/cvs/claws-mail/claws/src/prefs_common.c,v
retrieving revision 1.204.2.192
retrieving revision 1.204.2.193
diff -u -d -r1.204.2.192 -r1.204.2.193
--- prefs_common.c	21 Aug 2009 15:56:29 -0000	1.204.2.192
+++ prefs_common.c	7 Oct 2009 07:34:01 -0000	1.204.2.193
@@ -1030,6 +1030,11 @@
 	{"aboutwin_height", "500", &prefs_common.aboutwin_height, P_INT,
 	 NULL, NULL, NULL},
 
+	{"addrgather_width", "450", &prefs_common.addrgather_width, P_INT,
+	 NULL, NULL, NULL},
+	{"addrgather_height", "-1", &prefs_common.addrgather_height, P_INT,
+	 NULL, NULL, NULL},
+
 	/* Hidden */
 	{"warn_dnd", "1", &prefs_common.warn_dnd, P_INT,
 	 NULL, NULL, NULL},

Index: prefs_common.h
===================================================================
RCS file: /srv/cvs/claws-mail/claws/src/prefs_common.h,v
retrieving revision 1.103.2.125
retrieving revision 1.103.2.126
diff -u -d -r1.103.2.125 -r1.103.2.126
--- prefs_common.h	21 Aug 2009 15:56:29 -0000	1.103.2.125
+++ prefs_common.h	7 Oct 2009 07:34:01 -0000	1.103.2.126
@@ -469,6 +469,8 @@
 	gint addressbook_folderselwin_height;
 	gint aboutwin_width;
 	gint aboutwin_height;
+	gint addrgather_width;
+	gint addrgather_height;
 
 	gint warn_dnd;
 	gint broken_are_utf8;

Index: addrgather.c
===================================================================
RCS file: /srv/cvs/claws-mail/claws/src/addrgather.c,v
retrieving revision 1.5.10.29
retrieving revision 1.5.10.30
diff -u -d -r1.5.10.29 -r1.5.10.30
--- addrgather.c	28 Jul 2009 18:42:50 -0000	1.5.10.29
+++ addrgather.c	7 Oct 2009 07:34:01 -0000	1.5.10.30
@@ -42,6 +42,7 @@
 #include "manage_window.h"
 #include "folder.h"
 #include "utils.h"
+#include "prefs_common.h"
 
 #include "addrharvest.h"
 #include "addrindex.h"
@@ -127,6 +128,15 @@
 	return FALSE;
 }
 
+static void addrgather_size_allocate(
+	GtkWidget *widget, GtkAllocation *allocation )
+{
+	cm_return_if_fail( allocation != NULL );
+	
+	prefs_common.addrgather_width	= allocation->width;
+	prefs_common.addrgather_height	= allocation->height;
+}
+
 #define FMT_BUFSIZE 32
 
 static gboolean addrgather_dlg_harvest() {
@@ -338,7 +348,8 @@
 	gtk_container_set_border_width(GTK_CONTAINER(vboxf), 8);
 
 	for (i = 0; i < NUM_FIELDS; i++) {
-		PACK_CHECK_BUTTON(vboxf, checkHeader[i], _harv_headerNames_[i]);
+		PACK_CHECK_BUTTON(vboxf, checkHeader[i],
+			prefs_common_translated_header_name(_harv_headerNames_[i]));
 		addrgather_dlg.checkHeader[i] = checkHeader[i];
 	}
 
@@ -417,9 +428,9 @@
 	GtkWidget *vbox;
 	GtkWidget *hbbox;
 	GtkWidget *hsbox;
-
+	static GdkGeometry geometry;
+	
 	window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "addrgather");
-	gtk_widget_set_size_request(window, 380, -1);
 	gtk_container_set_border_width(GTK_CONTAINER(window), 4);
 	gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
 	gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
@@ -428,6 +439,8 @@
 			 G_CALLBACK(addrgather_dlg_delete_event), NULL);
 	g_signal_connect(G_OBJECT(window), "key_press_event",
 			 G_CALLBACK(addrgather_dlg_key_pressed), NULL);
+	g_signal_connect(G_OBJECT(window), "size_allocate",
+			 G_CALLBACK(addrgather_size_allocate), NULL);
 
 	vbox = gtk_vbox_new(FALSE, 6);
 	gtk_container_add(GTK_CONTAINER(window), vbox);
@@ -457,6 +470,16 @@
 	g_signal_connect(G_OBJECT(btnCancel), "clicked",
 			 G_CALLBACK(addrgather_dlg_cancel), NULL);
 
+	if (!geometry.min_width) {
+		geometry.min_width = 450;
+		geometry.min_height = -1;
+	}
+
+	gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL, &geometry,
+				      GDK_HINT_MIN_SIZE);
+	gtk_window_set_default_size(GTK_WINDOW(window), prefs_common.addrgather_width,
+				    prefs_common.addrgather_height);
+
 	gtk_widget_show_all(vbox);
 
 	addrgather_dlg.window     = window;
@@ -512,6 +535,7 @@
 	}
 
 	gtk_widget_set_sensitive(addrgather_dlg.btnOk, TRUE);
+	gtk_widget_set_sensitive(addrgather_dlg.btnCancel, TRUE);
 	gtk_widget_grab_default(addrgather_dlg.btnOk);
 
 	/* Apply window title */