CVS: sylpheedclaws/sylpheed-claws/src prefs_common.c,1.204.2.115,1.204.2.116 prefs_common.h,1.103.2.72,1.103.2.73 addressbook.c,1.60.2.72,1.60.2.73 addressitem.h,1.5.2.6,1.5.2.7

Update of /pack/anoncvs/sylpheedclaws/sylpheed-claws/src
In directory sunsite.dk:/tmp/cvs-serv13482/src

Modified Files:
      Tag: gtk2
	prefs_common.c prefs_common.h addressbook.c addressitem.h 
Log Message:
2006-12-28 [wwp]	2.6.1cvs82

	* src/prefs_common.c
	* src/prefs_common.h
	* src/addressbook.c
	* src/addressitem.h
		Save addressbook mainwindow's horizontal and vertical splitter position.

Index: prefs_common.c
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/src/prefs_common.c,v
retrieving revision 1.204.2.115
retrieving revision 1.204.2.116
diff -u -d -r1.204.2.115 -r1.204.2.116
--- prefs_common.c	2006/12/21 10:52:29	1.204.2.115
+++ prefs_common.c	2006/12/28 09:53:13	1.204.2.116
@@ -644,6 +644,10 @@
 	/* Addressbook */
 	{"addressbook_use_editaddress_dialog", "TRUE", &prefs_common.addressbook_use_editaddress_dialog,
 	 P_BOOL, NULL, NULL, NULL},
+	{"addressbook_hpaned_pos", "-1", &prefs_common.addressbook_hpaned_pos,
+	 P_INT, NULL, NULL, NULL},
+	{"addressbook_vpaned_pos", "-1", &prefs_common.addressbook_vpaned_pos,
+	 P_INT, NULL, NULL, NULL},
 
 	/* Other */
 	{"uri_open_command", DEFAULT_BROWSER_CMD,

Index: prefs_common.h
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/src/prefs_common.h,v
retrieving revision 1.103.2.72
retrieving revision 1.103.2.73
diff -u -d -r1.103.2.72 -r1.103.2.73
--- prefs_common.h	2006/12/21 10:52:29	1.103.2.72
+++ prefs_common.h	2006/12/28 09:53:14	1.103.2.73
@@ -310,6 +310,8 @@
 
 	/* Addressbook */
 	gboolean addressbook_use_editaddress_dialog;
+	gint addressbook_hpaned_pos;
+	gint addressbook_vpaned_pos;
 
 	/* Interface */
 	gboolean sep_folder;

Index: addressbook.c
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/src/addressbook.c,v
retrieving revision 1.60.2.72
retrieving revision 1.60.2.73
diff -u -d -r1.60.2.72 -r1.60.2.73
--- addressbook.c	2006/12/01 14:41:37	1.60.2.72
+++ addressbook.c	2006/12/28 09:53:14	1.60.2.73
@@ -825,6 +825,15 @@
 	address_list_has_focus = FALSE;
 }
 
+/* save hpane and vpane's handle position when it moves */
+static void addressbook_pane_notify_position(GObject *gobject,
+											GParamSpec	*arg1,
+                                            gpointer	 user_data)
+{
+	prefs_common.addressbook_hpaned_pos = gtk_paned_get_position(GTK_PANED(addrbook.hpaned));
+	prefs_common.addressbook_vpaned_pos = gtk_paned_get_position(GTK_PANED(addrbook.vpaned));
+}
+
 /*
 * Create the address book widgets. The address book contains two CTree widgets: the
 * address index tree on the left and the address list on the right.
@@ -1171,6 +1180,8 @@
 				       NULL);
 
 	addrbook.window  = window;
+	addrbook.hpaned  = hpaned;
+	addrbook.vpaned  = vpaned;
 	addrbook.menubar = menubar;
 	addrbook.ctree   = ctree;
 	addrbook.ctree_swin
@@ -1209,6 +1220,15 @@
 				      GDK_HINT_MIN_SIZE);
 	gtk_widget_set_size_request(window, prefs_common.addressbookwin_width,
 				    prefs_common.addressbookwin_height);
+
+	if (!prefs_common.addressbook_use_editaddress_dialog) {
+		gtk_paned_set_position(GTK_PANED(vpaned), prefs_common.addressbook_vpaned_pos);
+		g_signal_connect(G_OBJECT(vpaned), "notify::position",
+				G_CALLBACK(addressbook_pane_notify_position), NULL);
+	}	
+	gtk_paned_set_position(GTK_PANED(hpaned), prefs_common.addressbook_hpaned_pos);
+	g_signal_connect(G_OBJECT(hpaned), "notify::position",
+			G_CALLBACK(addressbook_pane_notify_position), NULL);
 
 	gtk_widget_show_all(window);
 }

Index: addressitem.h
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/src/addressitem.h,v
retrieving revision 1.5.2.6
retrieving revision 1.5.2.7
diff -u -d -r1.5.2.6 -r1.5.2.7
--- addressitem.h	2006/12/01 14:24:47	1.5.2.6
+++ addressitem.h	2006/12/28 09:53:14	1.5.2.7
@@ -60,6 +60,8 @@
 struct _AddressBook_win
 {
 	GtkWidget *window;
+	GtkWidget *hpaned;
+	GtkWidget *vpaned;
 	GtkWidget *menubar;
 	GtkWidget *ctree;
 	GtkWidget *ctree_swin;