changeset 15035:8c5c4d7d53a5

[gaim-migrate @ 17817] minor graphical tweaks committer: Tailor Script <[e-mail]>

--- a/gtk/gtkaccount.c	Thu Nov 23 15:22:53 2006 +0000
+++ b/gtk/gtkaccount.c	Thu Nov 23 22:35:32 2006 +0000
@@ -2316,7 +2316,7 @@
 	                        : (gaim_connection_get_display_name(gc) != NULL
 	                           ? gaim_connection_get_display_name(gc)
 	                           : gaim_account_get_username(account))),
-	                       (msg != NULL ? ":\n" : "."),
+	                       (msg != NULL ? ": " : "."),
 	                       (msg != NULL ? msg  : ""));
 }
 

--- a/gtk/gtkblist.c	Thu Nov 23 15:22:53 2006 +0000
+++ b/gtk/gtkblist.c	Thu Nov 23 22:35:32 2006 +0000
@@ -4177,11 +4177,11 @@
 	gtk_box_pack_start(GTK_BOX(gtkblist->vbox), sw, TRUE, TRUE, 0);
 	gtk_container_add(GTK_CONTAINER(sw), gtkblist->treeview);
 
+	gtkblist->scrollbook = gtk_gaim_scroll_book_new();
+	gtk_box_pack_start(GTK_BOX(gtkblist->vbox), gtkblist->scrollbook, FALSE, FALSE, 0);
+
 	sep = gtk_hseparator_new();
 	gtk_box_pack_start(GTK_BOX(gtkblist->vbox), sep, FALSE, FALSE, 0);
-
-	gtkblist->scrollbook = gtk_gaim_scroll_book_new();
-	gtk_box_pack_start(GTK_BOX(gtkblist->vbox), gtkblist->scrollbook, FALSE, FALSE, 0);
 	
 	/* Create an empty vbox used for showing connection errors */
 	gtkblist->error_buttons = gtk_vbox_new(FALSE, 0);

--- a/gtk/gtkutils.c	Thu Nov 23 15:22:53 2006 +0000
+++ b/gtk/gtkutils.c	Thu Nov 23 22:35:32 2006 +0000
@@ -2883,10 +2883,11 @@
 {
 	GtkWidget *vbox;
         GtkWidget *hbox;
-        GtkWidget *bbox;
+        GtkWidget *hbox2;
         GtkWidget *label;
         GtkWidget *button;
         GtkWidget *img = NULL;
+	GtkSizeGroup *sg = gtk_size_group_new(GTK_SIZE_GROUP_BOTH);
 	char label_text[2048];
 	const char *button_text;
 	GCallback callback;
@@ -2926,37 +2927,38 @@
 		   primary_esc, secondary ? "\n" : "", secondary?secondary_esc:"");
 	g_free(primary_esc);
 	label = gtk_label_new(NULL);
+	gtk_widget_set_size_request(label, gaim_prefs_get_int("/gaim/gtk/blist/width")-16,-1);
         gtk_widget_modify_text(vbox, GTK_STATE_NORMAL, &(label->style->white));
         gtk_label_set_markup(GTK_LABEL(label), label_text);
         gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
         gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
         gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
 #if GTK_CHECK_VERSION(2,6,0)
-	 g_object_set(label, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
+	//	g_object_set(label, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
 #endif
-
-        bbox = gtk_hbutton_box_new();
-        gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
-        gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
-	gtk_box_set_spacing(GTK_BOX(bbox), 6);
+	
+	hbox2 = gtk_hbox_new(FALSE, 6);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox2, FALSE, FALSE, 0);
 	
 	va_start(args, user_data);
 	while ((button_text = va_arg(args, char*))) {
 		callback = va_arg(args, GCallback);
 		button = gtk_button_new();
-		gtk_container_set_border_width(GTK_CONTAINER(button), 0);
+	
 		if (callback)
 			g_signal_connect_swapped(G_OBJECT(button), "clicked", callback, user_data);
 		g_signal_connect_swapped(G_OBJECT(button), "clicked", G_CALLBACK(gtk_widget_destroy), vbox);
 		hbox = gtk_hbox_new(FALSE, 0);
 		gtk_container_add(GTK_CONTAINER(button), hbox);
+		gtk_container_set_border_width(GTK_CONTAINER(hbox), 3);
 		g_snprintf(label_text, sizeof(label_text),
 			   "<span size=\"smaller\">%s</span>", button_text);
 		label = gtk_label_new(NULL);
 		gtk_label_set_markup_with_mnemonic(GTK_LABEL(label), label_text);
 		gtk_misc_set_alignment(GTK_MISC(label), 0.5, 0.5);
 		gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
-		gtk_container_add(GTK_CONTAINER(bbox), button);
+		gtk_box_pack_end(GTK_CONTAINER(hbox2), button, FALSE, FALSE, 0);
+		gtk_size_group_add_widget(sg, button);
 	}
 	va_end(args);
 

--- a/libgaim/account.h	Thu Nov 23 15:22:53 2006 +0000
+++ b/libgaim/account.h	Thu Nov 23 22:35:32 2006 +0000
@@ -44,7 +44,7 @@
 {
 	/* A buddy we already have added us to their buddy list. */
 	void (*notify_added)(GaimAccount *account, const char *remote_user,
-	                     const char *id, const char *alias,
+	                    const char *id, const char *alias,
 	                     const char *message);
 	void (*status_changed)(GaimAccount *account, GaimStatus *status);
 	/* Someone we don't have on our list added us. Will prompt to add them. */