# HG changeset patch
# User Luke Schierer <lschiere@pidgin.im>
# Date 1084938889 0
# Node ID 574393ccd705fb7da3fb8036ab316bedcd7a8b87
# Parent  c2ad41f7c82b18b820567e20e6b7c2c328b8e93c
[gaim-migrate @ 9749]
"
Cleans up some formatting oddnes in gtkblist.c, and somewhat standardizes
the way the dialogs are specified as to their being type hint DIALOG
windows. This still could use some more cleaning up, but that'd ideally
involve moving the Join a Chat, Add Buddy, and Add Chat dialogs to the
request api and that's more work then I cared to do right now." --deryni

committer: Tailor Script <tailor@pidgin.im>

diff -r c2ad41f7c82b -r 574393ccd705 src/gtkblist.c
--- a/src/gtkblist.c	Wed May 19 03:50:52 2004 +0000
+++ b/src/gtkblist.c	Wed May 19 03:54:49 2004 +0000
@@ -807,18 +807,17 @@
 								   GTK_ICON_SIZE_DIALOG);
 	data = g_new0(GaimGtkJoinChatData, 1);
 
-	data->window = gtk_dialog_new_with_buttons(
-		_("Join a Chat"),
-		gtkblist->window ? GTK_WINDOW(gtkblist->window) : NULL, 0,
+	data->window = gtk_dialog_new_with_buttons(_("Join a Chat"),
+		NULL, GTK_DIALOG_NO_SEPARATOR,
 		GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 		GAIM_STOCK_CHAT, GTK_RESPONSE_OK, NULL);
 	gtk_dialog_set_default_response(GTK_DIALOG(data->window), GTK_RESPONSE_OK);
 	gtk_container_set_border_width(GTK_CONTAINER(data->window), 6);
 	gtk_window_set_resizable(GTK_WINDOW(data->window), FALSE);
-	gtk_dialog_set_has_separator(GTK_DIALOG(data->window), FALSE);
 	gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(data->window)->vbox), 12);
 	gtk_container_set_border_width(
 		GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), 6);
+	gtk_window_set_role(GTK_WINDOW(data->window), "join_chat");
 
 	hbox = gtk_hbox_new(FALSE, 12);
 	gtk_container_add(GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), hbox);
@@ -3936,7 +3935,7 @@
 	gtkblist = GAIM_GTK_BLIST(gaim_get_blist());
 
 	data->window = gtk_dialog_new_with_buttons(_("Add Buddy"),
-			NULL, 0,
+			NULL, GTK_DIALOG_NO_SEPARATOR,
 			GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 			GTK_STOCK_ADD, GTK_RESPONSE_OK,
 			NULL);
@@ -3944,10 +3943,11 @@
 	gtk_dialog_set_default_response(GTK_DIALOG(data->window), GTK_RESPONSE_OK);
 	gtk_container_set_border_width(GTK_CONTAINER(data->window), 6);
 	gtk_window_set_resizable(GTK_WINDOW(data->window), FALSE);
-	gtk_dialog_set_has_separator(GTK_DIALOG(data->window), FALSE);
 	gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(data->window)->vbox), 12);
 	gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), 6);
 	gtk_window_set_role(GTK_WINDOW(data->window), "add_buddy");
+	gtk_window_set_type_hint(GTK_WINDOW(data->window),
+	                         GDK_WINDOW_TYPE_HINT_DIALOG);
 
 	hbox = gtk_hbox_new(FALSE, 12);
 	gtk_container_add(GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), hbox);
@@ -4224,9 +4224,9 @@
 								const char *alias)
 {
 	GaimGtkAddChatData *data;
-    GaimGtkBuddyList *gtkblist;
-    GList *l;
-    GaimConnection *gc;
+	GaimGtkBuddyList *gtkblist;
+	GList *l;
+	GaimConnection *gc;
 	GtkWidget *label;
 	GtkWidget *rowbox;
 	GtkWidget *hbox;
@@ -4238,9 +4238,9 @@
 	img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION,
 								   GTK_ICON_SIZE_DIALOG);
 
-    gtkblist = GAIM_GTK_BLIST(gaim_get_blist());
-
-    if (account != NULL)
+	gtkblist = GAIM_GTK_BLIST(gaim_get_blist());
+
+	if (account != NULL)
 	{
 		data->account = account;
 	}
@@ -4269,19 +4269,20 @@
 
 	data->sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
 
-    data->window = gtk_dialog_new_with_buttons(_("Add Chat"),
-            NULL, 0,
-            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-            GTK_STOCK_ADD, GTK_RESPONSE_OK,
-            NULL);
-
-    gtk_dialog_set_default_response(GTK_DIALOG(data->window), GTK_RESPONSE_OK);
-    gtk_container_set_border_width(GTK_CONTAINER(data->window), 6);
-    gtk_window_set_resizable(GTK_WINDOW(data->window), FALSE);
-    gtk_dialog_set_has_separator(GTK_DIALOG(data->window), FALSE);
-    gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(data->window)->vbox), 12);
-    gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), 6);
+	data->window = gtk_dialog_new_with_buttons(_("Add Chat"),
+		NULL, GTK_DIALOG_NO_SEPARATOR,
+		GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+		GTK_STOCK_ADD, GTK_RESPONSE_OK,
+		NULL);
+
+	gtk_dialog_set_default_response(GTK_DIALOG(data->window), GTK_RESPONSE_OK);
+	gtk_container_set_border_width(GTK_CONTAINER(data->window), 6);
+	gtk_window_set_resizable(GTK_WINDOW(data->window), FALSE);
+	gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(data->window)->vbox), 12);
+	gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), 6);
 	gtk_window_set_role(GTK_WINDOW(data->window), "add_chat");
+	gtk_window_set_type_hint(GTK_WINDOW(data->window),
+	                         GDK_WINDOW_TYPE_HINT_DIALOG);
 
 	hbox = gtk_hbox_new(FALSE, 12);
 	gtk_container_add(GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), hbox);