# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1211042561 0
# Node ID 2a79e13aef4402bf08471a4fb4eb2fef8f47bba1
# Parent  307bab4c9e63237c324a004212036422b27f7bca# Parent  3bb677b57e4bda881cdd29e3dda1eade8dab70e9
merge of '4981895b0b7aadf94bcca49e105176b49f71d50d'
     and '6126637fa90f27a38f1df1bb798f333ee3311849'

diff -r 3bb677b57e4b -r 2a79e13aef44 finch/gntlog.c
--- a/finch/gntlog.c	Sat May 17 13:40:56 2008 +0000
+++ b/finch/gntlog.c	Sat May 17 16:42:41 2008 +0000
@@ -302,7 +302,7 @@
 
 	/* Label ************/
 	text = g_strdup_printf("%s", title);
-	lv->label = gnt_label_new(text);
+	lv->label = gnt_label_new_with_format(text, GNT_TEXT_FLAG_BOLD);
 	g_free(text);
 	gnt_box_add_widget(GNT_BOX(vbox), lv->label);
 
diff -r 3bb677b57e4b -r 2a79e13aef44 finch/libgnt/wms/irssi.c
--- a/finch/libgnt/wms/irssi.c	Sat May 17 13:40:56 2008 +0000
+++ b/finch/libgnt/wms/irssi.c	Sat May 17 16:42:41 2008 +0000
@@ -1,8 +1,8 @@
 /**
  * 1. Buddylist is aligned on the left.
  * 2. The rest of the screen is split into MxN grid for conversation windows.
- * 	- M = irssi-split-h in ~/.gntrc:[general]
- * 	- N = irssi-split-v in ~/.gntrc:[general]
+ * 	- M = split-h in ~/.gntrc:[irssi]
+ * 	- N = split-v in ~/.gntrc:[irssi]
  *	- Press alt-shift-k/j/l/h to move the selected window to the frame
  *	  above/below/left/right of the current frame.
  * 3. All the other windows are always centered.
@@ -52,7 +52,8 @@
 	rx = irssi->buddylistwidth;
 	if (hor)
 		rx += hor * width;
-	rx++;
+	if (rx)
+		rx++;
 
 	ry = 0;
 	if (vert)
diff -r 3bb677b57e4b -r 2a79e13aef44 pidgin/gtkprefs.c
--- a/pidgin/gtkprefs.c	Sat May 17 13:40:56 2008 +0000
+++ b/pidgin/gtkprefs.c	Sat May 17 16:42:41 2008 +0000
@@ -879,9 +879,6 @@
 	 */
 	if(!changed)
 		purple_debug_warning("gtkprefs", "Escape accel failed to change\n");
-
-	/* TODO: create pidgin_accels_schedule_save */
-	pidgin_save_accels_cb(NULL, 0, 0, NULL, NULL);
 }
 
 
@@ -919,8 +916,8 @@
 	escape_closes_conversation_cb_id = g_signal_connect(checkbox,
 		"clicked", G_CALLBACK(escape_closes_conversation_cb), NULL);
 
-	g_signal_connect(map, "changed::" CONVERSATION_CLOSE_ACCEL_PATH,
-		G_CALLBACK(conversation_close_accel_changed_cb), checkbox);
+	g_signal_connect_object(map, "changed::" CONVERSATION_CLOSE_ACCEL_PATH,
+		G_CALLBACK(conversation_close_accel_changed_cb), checkbox, (GConnectFlags)0);
 
 	gtk_box_pack_start(GTK_BOX(vbox), checkbox, FALSE, FALSE, 0);
 }