Mercurial > pidgin

changeset 17174:bf1cde8614c1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of '06ed1317cb35c9aeacf41bd7e250a1f7c1dc8876' and '76512c66ad9097fe44dde4e941b2f8d6edeea0a7'
author Richard Laager <rlaager@wiktel.com>
date Sun, 20 May 2007 17:53:37 +0000
parents 662552c912b4 (diff) f199d701d1b1 (current diff)
children c6c9f8a6dd9c
files
diffstat 1 files changed, 107 insertions(+), 101 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin/gtkutils.c	Sun May 20 09:57:08 2007 +0000
+++ b/pidgin/gtkutils.c	Sun May 20 17:53:37 2007 +0000
@@ -62,9 +62,9 @@
 #include "gtkutils.h"
 
 typedef struct {
-	GtkWidget *menu ;
-	gint default_item ;
-} AOP_MENU ;
+	GtkWidget *menu;
+	gint default_item;
+} AOP_MENU;
 
 static guint accels_save_timer = 0;
 
@@ -440,8 +440,8 @@
 {
 	GtkWidget *menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(optmenu));
 	GtkWidget *item = gtk_menu_get_active(GTK_MENU(menu));
-	if (NULL != p_item)
-		(*p_item) = item ;
+	if (p_item)
+		(*p_item) = item;
 	return g_object_get_data(G_OBJECT(item), "aop_per_item_data");
 }
 
@@ -451,45 +451,47 @@
 	GtkWidget *item;
 	gpointer per_item_data;
 
-	per_item_data = aop_option_menu_get_selected(optmenu, &item) ;
+	per_item_data = aop_option_menu_get_selected(optmenu, &item);
 
 	if (cb != NULL)
+	{
 		((void (*)(GtkWidget *, gpointer, gpointer))cb)(item, per_item_data,
-															 g_object_get_data(G_OBJECT(optmenu), "user_data"));
+		                                                g_object_get_data(G_OBJECT(optmenu), "user_data"));
+	}
 }
 
 static GtkWidget *
-aop_menu_item_new(GtkSizeGroup *sg, GdkPixbuf *pixbuf, char *lbl, gpointer per_item_data)
+aop_menu_item_new(GtkSizeGroup *sg, GdkPixbuf *pixbuf, const char *lbl, gpointer per_item_data)
 {
-	GtkWidget *item ;
-	GtkWidget *hbox ;
-	GtkWidget *image ;
-	GtkWidget *label ;
-
-	item = g_object_new(GTK_TYPE_MENU_ITEM, "visible", TRUE, NULL) ;
-	hbox = g_object_new(GTK_TYPE_HBOX, "visible", TRUE, "homogeneous", FALSE, "spacing", 4, NULL) ;
+	GtkWidget *item;
+	GtkWidget *hbox;
+	GtkWidget *image;
+	GtkWidget *label;
+
+	item = g_object_new(GTK_TYPE_MENU_ITEM, "visible", TRUE, NULL);
+	hbox = g_object_new(GTK_TYPE_HBOX, "visible", TRUE, "homogeneous", FALSE, "spacing", 4, NULL);
 
 	/* Create the image */
-	if (NULL == pixbuf)
-		image = g_object_new(GTK_TYPE_IMAGE, "visible", TRUE, NULL) ;
+	if (pixbuf == NULL)
+		image = g_object_new(GTK_TYPE_IMAGE, "visible", TRUE, NULL);
 	else
-		image = g_object_new(GTK_TYPE_IMAGE, "visible", TRUE, "pixbuf", pixbuf, NULL) ;
-
-	if (NULL != sg)
-		gtk_size_group_add_widget(sg, image) ;
+		image = g_object_new(GTK_TYPE_IMAGE, "visible", TRUE, "pixbuf", pixbuf, NULL);
+
+	if (sg)
+		gtk_size_group_add_widget(sg, image);
 
 	/* Create the label */
-	label = g_object_new(GTK_TYPE_LABEL, "visible", TRUE, "justify", GTK_JUSTIFY_LEFT, "xalign", (gdouble)0.0, "yalign", (gdouble)0.5, "label", lbl, NULL) ;
+	label = g_object_new(GTK_TYPE_LABEL, "visible", TRUE, "justify", GTK_JUSTIFY_LEFT, "xalign", (gdouble)0.0, "yalign", (gdouble)0.5, "label", lbl, NULL);
 	
-	gtk_container_add(GTK_CONTAINER(item), hbox) ;
-	gtk_container_add_with_properties(GTK_CONTAINER (hbox), image, "expand", FALSE, "fill", FALSE, "padding", 0, NULL) ;
-	gtk_container_add_with_properties(GTK_CONTAINER (hbox), label, "expand", TRUE, "fill", TRUE, "padding", 0, NULL) ;
-
-	g_object_set_data(G_OBJECT (item), "aop_per_item_data", per_item_data) ;
+	gtk_container_add(GTK_CONTAINER(item), hbox);
+	gtk_container_add_with_properties(GTK_CONTAINER (hbox), image, "expand", FALSE, "fill", FALSE, "padding", 0, NULL);
+	gtk_container_add_with_properties(GTK_CONTAINER (hbox), label, "expand", TRUE, "fill", TRUE, "padding", 0, NULL);
+
+	g_object_set_data(G_OBJECT (item), "aop_per_item_data", per_item_data);
 
 	pidgin_set_accessible_label(item, label);
 
-	return item ;
+	return item;
 }
 
 static GtkWidget *
@@ -497,146 +499,150 @@
 {
 	GtkWidget *optmenu;
 
-	optmenu = g_object_new(GTK_TYPE_OPTION_MENU, "visible", TRUE, NULL) ;
-	gtk_option_menu_set_menu(GTK_OPTION_MENU (optmenu), aop_menu->menu) ;
+	optmenu = g_object_new(GTK_TYPE_OPTION_MENU, "visible", TRUE, NULL);
+	gtk_option_menu_set_menu(GTK_OPTION_MENU (optmenu), aop_menu->menu);
 	if (aop_menu->default_item != -1)
-		gtk_option_menu_set_history(GTK_OPTION_MENU(optmenu), aop_menu->default_item) ;
-
-	g_object_set_data_full(G_OBJECT(optmenu), "aop_menu", aop_menu, (GDestroyNotify)g_free) ;
-	g_object_set_data(G_OBJECT(optmenu), "user_data", user_data) ;
-
-	g_signal_connect(G_OBJECT(optmenu), "changed", G_CALLBACK(aop_menu_cb), cb) ;
-
-	return optmenu ;
+		gtk_option_menu_set_history(GTK_OPTION_MENU(optmenu), aop_menu->default_item);
+
+	g_object_set_data_full(G_OBJECT(optmenu), "aop_menu", aop_menu, (GDestroyNotify)g_free);
+	g_object_set_data(G_OBJECT(optmenu), "user_data", user_data);
+
+	g_signal_connect(G_OBJECT(optmenu), "changed", G_CALLBACK(aop_menu_cb), cb);
+
+	return optmenu;
 }
 
 static void
 aop_option_menu_replace_menu(GtkWidget *optmenu, AOP_MENU *new_aop_menu)
 {
-	if (NULL != gtk_option_menu_get_menu(GTK_OPTION_MENU(optmenu)))
+	if (gtk_option_menu_get_menu(GTK_OPTION_MENU(optmenu)))
 		gtk_option_menu_remove_menu(GTK_OPTION_MENU(optmenu));
-	gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu), new_aop_menu->menu) ;
-	if (-1 != new_aop_menu->default_item)
-		gtk_option_menu_set_history(GTK_OPTION_MENU(optmenu), new_aop_menu->default_item) ;
-	g_object_set_data_full(G_OBJECT(optmenu), "aop_menu", new_aop_menu, (GDestroyNotify)g_free) ;
+	gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu), new_aop_menu->menu);
+	if (new_aop_menu->default_item != -1)
+		gtk_option_menu_set_history(GTK_OPTION_MENU(optmenu), new_aop_menu->default_item);
+	g_object_set_data_full(G_OBJECT(optmenu), "aop_menu", new_aop_menu, (GDestroyNotify)g_free);
 }
 
 static void
 aop_option_menu_select_by_data(GtkWidget *optmenu, gpointer data)
 {
-	guint idx ;
-	GList *llItr = NULL ;
-
-	for (idx = 0, llItr = GTK_MENU_SHELL(gtk_option_menu_get_menu(GTK_OPTION_MENU (optmenu)))->children ;
-			 llItr != NULL ;
-			 llItr = llItr->next, idx++)
+	guint idx;
+	GList *llItr = NULL;
+
+	for (idx = 0, llItr = GTK_MENU_SHELL(gtk_option_menu_get_menu(GTK_OPTION_MENU (optmenu)))->children;
+	     llItr != NULL;
+	     llItr = llItr->next, idx++)
+	{
 		if (data == g_object_get_data(G_OBJECT(llItr->data), "aop_per_item_data"))
-			{
-			gtk_option_menu_set_history(GTK_OPTION_MENU(optmenu), idx) ;
-			break ;
-			}
+		{
+			gtk_option_menu_set_history(GTK_OPTION_MENU(optmenu), idx);
+			break;
+		}
+	}
 }
 
 static GdkPixbuf *
 get_prpl_pixbuf(PurplePluginProtocolInfo *prpl_info)
 {
-	const char *proto_name ;
-	GdkPixbuf *pixbuf = NULL ;
-	char *filename ;
+	const char *proto_name;
+	GdkPixbuf *pixbuf = NULL;
+	char *filename;
 	char buf[256];
 
-	proto_name = prpl_info->list_icon(NULL, NULL) ;
-	if (NULL == proto_name) return NULL ;
-
-	g_snprintf(buf, sizeof(buf), "%s.png", proto_name) ;
-	filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "protocols", "16", buf, NULL) ;
-	pixbuf = gdk_pixbuf_new_from_file(filename, NULL) ;
-	g_free(filename) ;
-
-	return pixbuf ;
+	proto_name = prpl_info->list_icon(NULL, NULL);
+	g_return_val_if_fail(proto_name != NULL, NULL);
+
+	g_snprintf(buf, sizeof(buf), "%s.png", proto_name);
+	filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "protocols", "16", buf, NULL);
+	pixbuf = gdk_pixbuf_new_from_file(filename, NULL);
+	g_free(filename);
+
+	return pixbuf;
 }
 
 static AOP_MENU *create_protocols_menu(const char *default_proto_id)
 {
-	AOP_MENU *aop_menu = NULL ;
+	AOP_MENU *aop_menu = NULL;
 	PurplePluginProtocolInfo *prpl_info;
 	PurplePlugin *plugin;
 	GdkPixbuf *pixbuf = NULL;
 	GtkSizeGroup *sg;
 	GList *p;
-	char *gtalk_name = NULL ;
+	const char *gtalk_name = NULL;
 	int i;
 
-	aop_menu = g_malloc0(sizeof(AOP_MENU)) ;
-	aop_menu->default_item = -1 ;
-	aop_menu->menu = g_object_new(GTK_TYPE_MENU, "visible", TRUE, NULL) ;
-	sg = g_object_new(GTK_TYPE_SIZE_GROUP, "mode", GTK_SIZE_GROUP_HORIZONTAL, NULL) ;
+	aop_menu = g_malloc0(sizeof(AOP_MENU));
+	aop_menu->default_item = -1;
+	aop_menu->menu = g_object_new(GTK_TYPE_MENU, "visible", TRUE, NULL);
+	sg = g_object_new(GTK_TYPE_SIZE_GROUP, "mode", GTK_SIZE_GROUP_HORIZONTAL, NULL);
 
 	if (purple_find_prpl("prpl-jabber"))
 		gtalk_name = _("Google Talk");
 
 	for (p = purple_plugins_get_protocols(), i = 0;
 		 p != NULL;
-		 p = p->next, i++) {
+		 p = p->next, i++)
+	{
 
 		plugin = (PurplePlugin *)p->data;
 		prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(plugin);
 
-		if (NULL != gtalk_name && strcmp(gtalk_name, plugin->info->name) < 0) {
+		if (gtalk_name && strcmp(gtalk_name, plugin->info->name) < 0)
+		{
 			char *filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "protocols",
-			                            "16", "google-talk.png", NULL);
+			                                  "16", "google-talk.png", NULL);
 			pixbuf = gdk_pixbuf_new_from_file(filename, NULL);
 			g_free(filename);
 
 			gtk_menu_shell_append(GTK_MENU_SHELL(aop_menu->menu),
 				aop_menu_item_new(sg, pixbuf, gtalk_name, "prpl-jabber"));
 
-			if (NULL != pixbuf)
-				g_object_unref(pixbuf) ;
-
-			gtalk_name = NULL ;
+			if (pixbuf)
+				g_object_unref(pixbuf);
+
+			gtalk_name = NULL;
 		}
 
-		pixbuf = get_prpl_pixbuf(prpl_info) ;
+		pixbuf = get_prpl_pixbuf(prpl_info);
 
 		gtk_menu_shell_append(GTK_MENU_SHELL(aop_menu->menu),
-			aop_menu_item_new(sg, pixbuf, plugin->info->name, plugin->info->id)) ;
-		if (NULL != pixbuf)
-			g_object_unref(pixbuf) ;
+			aop_menu_item_new(sg, pixbuf, plugin->info->name, plugin->info->id));
+		if (pixbuf)
+			g_object_unref(pixbuf);
 
 		if (default_proto_id != NULL && !strcmp(plugin->info->id, default_proto_id))
 			aop_menu->default_item = i;
 	}
 
-	g_object_unref(sg) ;
-
-	return aop_menu ;
+	g_object_unref(sg);
+
+	return aop_menu;
 }
 
 GtkWidget *
 pidgin_protocol_option_menu_new(const char *id, GCallback cb,
 								  gpointer user_data)
 {
-	return aop_option_menu_new(create_protocols_menu(id), cb, user_data) ;
+	return aop_option_menu_new(create_protocols_menu(id), cb, user_data);
 }
 
 PurpleAccount *
 pidgin_account_option_menu_get_selected(GtkWidget *optmenu)
 {
-	return (PurpleAccount *)aop_option_menu_get_selected(optmenu, NULL) ;
+	return (PurpleAccount *)aop_option_menu_get_selected(optmenu, NULL);
 }
 
 static AOP_MENU *
 create_account_menu(PurpleAccount *default_account,
 					PurpleFilterAccountFunc filter_func, gboolean show_all)
 {
-	AOP_MENU *aop_menu = NULL ;
+	AOP_MENU *aop_menu = NULL;
 	PurpleAccount *account;
 	GdkPixbuf *pixbuf = NULL;
 	GList *list;
 	GList *p;
 	GtkSizeGroup *sg;
-	int i ;
+	int i;
 	char buf[256];
 
 	if (show_all)
@@ -644,9 +650,9 @@
 	else
 		list = purple_connections_get_all();
 
-	aop_menu = g_malloc0(sizeof(AOP_MENU)) ;
-	aop_menu->default_item = -1 ;
-	aop_menu->menu = g_object_new(GTK_TYPE_MENU, "visible", TRUE, NULL) ;
+	aop_menu = g_malloc0(sizeof(AOP_MENU));
+	aop_menu->default_item = -1;
+	aop_menu->menu = g_object_new(GTK_TYPE_MENU, "visible", TRUE, NULL);
 	sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
 
 	for (p = list, i = 0; p != NULL; p = p->next, i++) {
@@ -673,7 +679,7 @@
 
 		/* Load the image. */
 		if (prpl_info != NULL) {
-			pixbuf = get_prpl_pixbuf(prpl_info) ;
+			pixbuf = get_prpl_pixbuf(prpl_info);
 
 			if (pixbuf != NULL) {
 				if (purple_account_is_disconnected(account) && show_all &&
@@ -696,8 +702,8 @@
 		gtk_menu_shell_append(GTK_MENU_SHELL(aop_menu->menu),
 			aop_menu_item_new(sg, pixbuf, buf, account));
 
-		if (NULL != pixbuf)
-			g_object_unref(pixbuf) ;
+		if (pixbuf)
+			g_object_unref(pixbuf);
 
 		if (default_account != NULL && account == default_account)
 			aop_menu->default_item = i;
@@ -705,7 +711,7 @@
 
 	g_object_unref(sg);
 
-	return aop_menu ;
+	return aop_menu;
 }
 
 static void
@@ -715,11 +721,11 @@
 	PurpleAccount *account;
 	PurpleFilterAccountFunc filter_func;
 
-	account = (PurpleAccount *)aop_option_menu_get_selected(optmenu, NULL) ;
+	account = (PurpleAccount *)aop_option_menu_get_selected(optmenu, NULL);
 	show_all = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(optmenu), "show_all"));
 	filter_func = g_object_get_data(G_OBJECT(optmenu), "filter_func");
 
-	aop_option_menu_replace_menu(optmenu, create_account_menu(account, filter_func, show_all)) ;
+	aop_option_menu_replace_menu(optmenu, create_account_menu(account, filter_func, show_all));
 }
 
 static void
@@ -746,7 +752,7 @@
 void
 pidgin_account_option_menu_set_selected(GtkWidget *optmenu, PurpleAccount *account)
 {
-	aop_option_menu_select_by_data(optmenu, (gpointer)account) ;
+	aop_option_menu_select_by_data(optmenu, (gpointer)account);
 }
 
 GtkWidget *
@@ -758,7 +764,7 @@
 	GtkWidget *optmenu;
 
 	/* Create the option menu */
-	optmenu = aop_option_menu_new(create_account_menu(default_account, filter_func, show_all), cb, user_data) ;
+	optmenu = aop_option_menu_new(create_account_menu(default_account, filter_func, show_all), cb, user_data);
 
 	g_signal_connect(G_OBJECT(optmenu), "destroy",
 					 G_CALLBACK(account_menu_destroyed_cb), NULL);
@@ -1822,7 +1828,7 @@
 		return TRUE;
 
 	if (optmenu != NULL)
-		aop_option_menu_select_by_data(optmenu, (gpointer)account) ;
+		aop_option_menu_select_by_data(optmenu, (gpointer)account);
 
 	return TRUE;
 }