diff src/gtkstatusbox.c @ 12286:255e6912607b

[gaim-migrate @ 14590] Mostly whitespace, but a couple small typo fixes, and an A;B -> B;A; swap to be consistent in plugins/notify.c committer: Tailor Script <tailor@pidgin.im>
author Etan Reisner <pidgin@unreliablesource.net>
date Thu, 01 Dec 2005 21:13:48 +0000
parents 0d6aeb831975
children d6b5373948f9
line wrap: on
line diff
--- a/src/gtkstatusbox.c	Thu Dec 01 20:09:27 2005 +0000
+++ b/src/gtkstatusbox.c	Thu Dec 01 21:13:48 2005 +0000
@@ -141,7 +141,7 @@
 	if (status_no != -1) {
 		gtk_widget_set_sensitive(GTK_WIDGET(status_box), FALSE);
 		gtk_combo_box_set_active(GTK_COMBO_BOX(status_box), status_no);
-		
+
 		message = gaim_status_get_attr_string(newstatus, "message");
 
 		if (!message || !*message)
@@ -187,7 +187,7 @@
 			                        statusbox, GAIM_CALLBACK(account_status_changed_cb));
 			statusbox->status_changed_signal = 0;
 		}
-		
+
 		if (statusbox->account)
 			statusbox->status_changed_signal = gaim_signal_connect(gaim_accounts_get_handle(), "account-status-changed",
 			                                                       statusbox, GAIM_CALLBACK(account_status_changed_cb),
@@ -397,7 +397,7 @@
 	gtk_combo_box_set_model(GTK_COMBO_BOX(status_box), NULL);
 	gtk_list_store_clear(status_box->dropdown_store);
 	gtk_combo_box_set_model(GTK_COMBO_BOX(status_box), GTK_TREE_MODEL(status_box->dropdown_store));
-	
+
 	account = GTK_GAIM_STATUS_BOX(status_box)->account;
 	if (account == NULL)
 	{
@@ -498,7 +498,7 @@
 
 static gboolean button_released_cb(GtkWidget *widget, GdkEventButton *event, GtkGaimStatusBox *box)
 {
-	
+
 	if (event->button != 1)
 		return FALSE;
 	gtk_combo_box_popdown(GTK_COMBO_BOX(box));
@@ -542,7 +542,7 @@
 	status_box->cell_view = gtk_cell_view_new();
 	status_box->vsep = gtk_vseparator_new();
 	status_box->arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE);
-	
+
 	status_box->store = gtk_list_store_new(NUM_COLUMNS, G_TYPE_INT, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
 	status_box->dropdown_store = gtk_list_store_new(NUM_COLUMNS, G_TYPE_INT, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
 	gtk_combo_box_set_model(GTK_COMBO_BOX(status_box), GTK_TREE_MODEL(status_box->dropdown_store));
@@ -583,7 +583,7 @@
 	status_box->toolbar = gtk_imhtmltoolbar_new();
 	gtk_imhtmltoolbar_attach(GTK_IMHTMLTOOLBAR(status_box->toolbar), status_box->imhtml);
 	status_box->hsep = gtk_hseparator_new();
-	
+
 	buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(status_box->imhtml));
 	g_signal_connect(G_OBJECT(status_box->toggle_button), "button-press-event",
 			 G_CALLBACK(button_pressed_cb), status_box);
@@ -607,10 +607,9 @@
 
 	gtk_box_pack_start(GTK_BOX(status_box->vbox), status_box->sw, TRUE, TRUE, 0);
 
-	g_signal_connect(G_OBJECT(status_box->imhtml), "scroll_event",	
+	g_signal_connect(G_OBJECT(status_box->imhtml), "scroll_event",
 					G_CALLBACK(scroll_event_cb), status_box->imhtml);
 
-
 #if GTK_CHECK_VERSION(2,6,0)
     gtk_combo_box_set_row_separator_func(GTK_COMBO_BOX(status_box), dropdown_store_row_separator_func, NULL, NULL);
 #endif
@@ -658,14 +657,13 @@
 	gtk_widget_size_request(GTK_GAIM_STATUS_BOX(widget)->vbox, &box_req);
 	if (box_req.height > 1)
 		requisition->height = requisition->height + box_req.height + 6;
-	
+
 	if (GTK_GAIM_STATUS_BOX(widget)->typing) {
 		gtk_widget_size_request(GTK_GAIM_STATUS_BOX(widget)->toolbar, &box_req);
 		requisition->height = requisition->height + box_req.height;
 	}
-	
+
 	requisition->width = 1;
-
 }
 
 static void
@@ -685,7 +683,6 @@
 	box_alc.width -= 6;
 	box_alc.x += 3;
 
-
 	gtk_widget_size_allocate((GTK_GAIM_STATUS_BOX(widget))->vbox, &box_alc);
 
 	parent_alc.height = MAX(1,req.height);
@@ -698,7 +695,6 @@
 	widget->allocation = *allocation;
 }
 
-
 static gboolean
 gtk_gaim_status_box_expose_event(GtkWidget *widget,
 				 GdkEventExpose *event)