pidgin.yaz: pidgin/gtkutils.c comparison

comparison pidgin/gtkutils.c @ 30909:25e200cb3532

propagate from branch 'im.pidgin.pidgin' (head dca20e09164518b0f7a773edd7e9649f41d8873d) to branch 'im.pidgin.cpw.malu.xmpp.google_refactor' (head 7823c556f2d1bbca43f5ef9f0fea30cabc5d313f)

author	Marcus Lundblad <ml@update.uu.se>
date	Tue, 31 Aug 2010 18:28:10 +0000
parents	351d07aefb09
children	c5ba7dd399fa 695b6e57e255

comparison

equal deleted inserted replaced

-:c44ec533a48c
+:25e200cb3532
 static AopMenu *
 create_protocols_menu(const char *default_proto_id)
 {
 	AopMenu *aop_menu = NULL;
-	PurplePluginProtocolInfo *prpl_info;
 	PurplePlugin *plugin;
 	GdkPixbuf *pixbuf = NULL;
 	GtkSizeGroup *sg;
 	GList *p;
 	const char *gtalk_name = NULL;
 	for (p = purple_plugins_get_protocols(), i = 0;
 		 p != NULL;
 		 p = p->next, i++) {
 		plugin = (PurplePlugin *)p->data;
-		prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(plugin);
 		if (gtalk_name && strcmp(gtalk_name, plugin->info->name) < 0) {
 			char *filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "protocols",
 			                                  "16", "google-talk.png", NULL);
 			GtkWidget *item;
 	aop_menu->menu = gtk_menu_new();
 	gtk_widget_show(aop_menu->menu);
 	sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
 	for (p = list, i = 0; p != NULL; p = p->next, i++) {
-		PurplePlugin *plugin;
 		if (show_all)
 			account = (PurpleAccount *)p->data;
 		else {
 			PurpleConnection *gc = (PurpleConnection *)p->data;
 		if (filter_func && !filter_func(account)) {
 			i--;
 			continue;
 		}
-		plugin = purple_find_prpl(purple_account_get_protocol_id(account));
 		pixbuf = pidgin_create_prpl_icon(account, PIDGIN_PRPL_ICON_SMALL);
 		if (pixbuf) {
 			if (purple_account_is_disconnected(account) && show_all &&
 {
 	char *protocol = NULL;
 	char *username = NULL;
 	char *alias    = NULL;
 	char *str;
-	char *c, *s;
+	char *s;
 	gboolean valid;
 	g_return_val_if_fail(msg          != NULL, FALSE);
 	g_return_val_if_fail(ret_protocol != NULL, FALSE);
 	g_return_val_if_fail(ret_username != NULL, FALSE);
 			s++;
 		if (*s == '\r') *s++ = '\0';
 		if (*s == '\n') *s++ = '\0';
-		if ((c = strchr(key, ':')) != NULL)
+		if (strchr(key, ':') != NULL)
 		{
 			if (!g_ascii_strcasecmp(key, "X-IM-Username:"))
 				username = g_strdup(value);
 			else if (!g_ascii_strcasecmp(key, "X-IM-Protocol:"))
 				protocol = g_strdup(value);
 					/* We couldn't convert to this image type.  Try the next
 					   image type. */
 					break;
 				}
-				if (spec->max_filesize == 0 || length < spec->max_filesize) {
+				if (spec->max_filesize == 0 || length <= spec->max_filesize) {
 					/* We were able to save the image as this image type and
 					   have it be within the size constraints.  Great!  Return
 					   the image. */
 					purple_debug_info("buddyicon", "Converted image from "
 							"%dx%d to %dx%d, format=%s, quality=%u, "
 		scale_factor *= 0.8;
 		new_width = orig_width * scale_factor;
 		new_height = orig_height * scale_factor;
 		g_object_unref(G_OBJECT(pixbuf));
 		pixbuf = gdk_pixbuf_scale_simple(original, new_width, new_height, GDK_INTERP_HYPER);
-	} while (new_width > 10 || new_height > 10);
+	} while ((new_width > 10 || new_height > 10) && new_width > spec->min_width && new_height > spec->min_height);
 	g_strfreev(prpl_formats);
 	g_object_unref(G_OBJECT(pixbuf));
 	g_object_unref(G_OBJECT(original));
 	tmp = g_strdup_printf(_("The file '%s' is too large for %s.  Please try a smaller image.\n"),
 	{
 		g_free(cb_datas->data);
 		cb_datas = g_list_delete_link(cb_datas, cb_datas);
 	}
 }
+static void
+mini_dialog_init(PidginMiniDialog *mini_dialog, PurpleConnection *gc, void *user_data, va_list args)
+{
+	const char *button_text;
+	GList *cb_datas = NULL;
+	static gboolean first_call = TRUE;
+	if (first_call) {
+		first_call = FALSE;
+		purple_signal_connect(purple_connections_get_handle(), "signed-off",
+		                      pidgin_utils_get_handle(),
+		                      PURPLE_CALLBACK(connection_signed_off_cb), NULL);
+	}
+	g_object_set_data(G_OBJECT(mini_dialog), "gc" ,gc);
+	g_signal_connect(G_OBJECT(mini_dialog), "destroy",
+		G_CALLBACK(alert_killed_cb), NULL);
+	while ((button_text = va_arg(args, char*))) {
+		struct _old_button_clicked_cb_data *data = NULL;
+		PidginMiniDialogCallback wrapper_cb = NULL;
+		PidginUtilMiniDialogCallback callback =
+			va_arg(args, PidginUtilMiniDialogCallback);
+		if (callback != NULL) {
+			data = g_new0(struct _old_button_clicked_cb_data, 1);
+			data->cb = callback;
+			data->data = user_data;
+			wrapper_cb = old_mini_dialog_button_clicked_cb;
+		}
+		pidgin_mini_dialog_add_button(mini_dialog, button_text,
+			wrapper_cb, data);
+		cb_datas = g_list_append(cb_datas, data);
+	}
+	g_signal_connect(G_OBJECT(mini_dialog), "destroy",
+		G_CALLBACK(old_mini_dialog_destroy_cb), cb_datas);
+}
+#define INIT_AND_RETURN_MINI_DIALOG(mini_dialog) \
+	va_list args; \
+	va_start(args, user_data); \
+	mini_dialog_init(mini_dialog, gc, user_data, args); \
+	va_end(args); \
+	return GTK_WIDGET(mini_dialog);
 GtkWidget *
 pidgin_make_mini_dialog(PurpleConnection *gc,
 const char *icon_name,
 const char *primary,
 const char *secondary,
 void *user_data,
 ...)
 {
-	PidginMiniDialog *mini_dialog;
+	PidginMiniDialog *mini_dialog = pidgin_mini_dialog_new(primary, secondary, icon_name);
-	const char *button_text;
+	INIT_AND_RETURN_MINI_DIALOG(mini_dialog);
-	GList *cb_datas = NULL;
+}
-	va_list args;
-	static gboolean first_call = TRUE;
+GtkWidget *
+pidgin_make_mini_dialog_with_custom_icon(PurpleConnection *gc,
-	if (first_call) {
+					GdkPixbuf *custom_icon,
-		first_call = FALSE;
+					const char *primary,
-		purple_signal_connect(purple_connections_get_handle(), "signed-off",
+					const char *secondary,
-		                      pidgin_utils_get_handle(),
+					void *user_data,
-		                      PURPLE_CALLBACK(connection_signed_off_cb), NULL);
+					...)
-	}
+{
+	PidginMiniDialog *mini_dialog = pidgin_mini_dialog_new_with_custom_icon(primary, secondary, custom_icon);
-	mini_dialog = pidgin_mini_dialog_new(primary, secondary, icon_name);
+	INIT_AND_RETURN_MINI_DIALOG(mini_dialog);
-	g_object_set_data(G_OBJECT(mini_dialog), "gc" ,gc);
-	g_signal_connect(G_OBJECT(mini_dialog), "destroy",
-		G_CALLBACK(alert_killed_cb), NULL);
-	va_start(args, user_data);
-	while ((button_text = va_arg(args, char*))) {
-		struct _old_button_clicked_cb_data *data = NULL;
-		PidginMiniDialogCallback wrapper_cb = NULL;
-		PidginUtilMiniDialogCallback callback =
-			va_arg(args, PidginUtilMiniDialogCallback);
-		if (callback != NULL) {
-			data = g_new0(struct _old_button_clicked_cb_data, 1);
-			data->cb = callback;
-			data->data = user_data;
-			wrapper_cb = old_mini_dialog_button_clicked_cb;
-		}
-		pidgin_mini_dialog_add_button(mini_dialog, button_text,
-			wrapper_cb, data);
-		cb_datas = g_list_append(cb_datas, data);
-	}
-	va_end(args);
-	g_signal_connect(G_OBJECT(mini_dialog), "destroy",
-		G_CALLBACK(old_mini_dialog_destroy_cb), cb_datas);
-	return GTK_WIDGET(mini_dialog);
 }
 /*
 * "This is so dead sexy."
 * "Two thumbs up."
 	return result;
 }
 gboolean pidgin_gdk_pixbuf_is_opaque(GdkPixbuf *pixbuf) {
-int width, height, rowstride, i;
+	int height, rowstride, i;
-unsigned char *pixels;
+	unsigned char *pixels;
-unsigned char *row;
+	unsigned char *row;
-if (!gdk_pixbuf_get_has_alpha(pixbuf))
+	if (!gdk_pixbuf_get_has_alpha(pixbuf))
-return TRUE;
+		return TRUE;
-width = gdk_pixbuf_get_width (pixbuf);
+	height = gdk_pixbuf_get_height (pixbuf);
-height = gdk_pixbuf_get_height (pixbuf);
+	rowstride = gdk_pixbuf_get_rowstride (pixbuf);
-rowstride = gdk_pixbuf_get_rowstride (pixbuf);
+	pixels = gdk_pixbuf_get_pixels (pixbuf);
-pixels = gdk_pixbuf_get_pixels (pixbuf);
+	row = pixels;
-row = pixels;
+	for (i = 3; i < rowstride; i+=4) {
-for (i = 3; i < rowstride; i+=4) {
+		if (row[i] < 0xfe)
-if (row[i] < 0xfe)
+			return FALSE;
-return FALSE;
+	}
-}
+	for (i = 1; i < height - 1; i++) {
-for (i = 1; i < height - 1; i++) {
+		row = pixels + (i * rowstride);
-row = pixels + (i*rowstride);
+		if (row[3] < 0xfe || row[rowstride - 1] < 0xfe) {
-if (row[3] < 0xfe || row[rowstride-1] < 0xfe) {
+			return FALSE;
-return FALSE;
+	    }
-}
+	}
-}
+	row = pixels + ((height - 1) * rowstride);
-row = pixels + ((height-1) * rowstride);
+	for (i = 3; i < rowstride; i += 4) {
-for (i = 3; i < rowstride; i+=4) {
+		if (row[i] < 0xfe)
-if (row[i] < 0xfe)
+			return FALSE;
-return FALSE;
+	}
-}
+	return TRUE;
-return TRUE;
 }
 void pidgin_gdk_pixbuf_make_round(GdkPixbuf *pixbuf) {
 	int width, height, rowstride;
-guchar *pixels;
+	guchar *pixels;
-if (!gdk_pixbuf_get_has_alpha(pixbuf))
+	if (!gdk_pixbuf_get_has_alpha(pixbuf))
-return;
+		return;
-width = gdk_pixbuf_get_width(pixbuf);
+	width = gdk_pixbuf_get_width(pixbuf);
-height = gdk_pixbuf_get_height(pixbuf);
+	height = gdk_pixbuf_get_height(pixbuf);
-rowstride = gdk_pixbuf_get_rowstride(pixbuf);
+	rowstride = gdk_pixbuf_get_rowstride(pixbuf);
-pixels = gdk_pixbuf_get_pixels(pixbuf);
+	pixels = gdk_pixbuf_get_pixels(pixbuf);
-if (width < 6 || height < 6)
+	if (width < 6 || height < 6)
-return;
+		return;
-/* Top left */
+	/* Top left */
-pixels[3] = 0;
+	pixels[3] = 0;
-pixels[7] = 0x80;
+	pixels[7] = 0x80;
-pixels[11] = 0xC0;
+	pixels[11] = 0xC0;
-pixels[rowstride + 3] = 0x80;
+	pixels[rowstride + 3] = 0x80;
-pixels[rowstride * 2 + 3] = 0xC0;
+	pixels[rowstride * 2 + 3] = 0xC0;
-/* Top right */
+	/* Top right */
-pixels[width * 4 - 1] = 0;
+	pixels[width * 4 - 1] = 0;
-pixels[width * 4 - 5] = 0x80;
+	pixels[width * 4 - 5] = 0x80;
-pixels[width * 4 - 9] = 0xC0;
+	pixels[width * 4 - 9] = 0xC0;
-pixels[rowstride + (width * 4) - 1] = 0x80;
+	pixels[rowstride + (width * 4) - 1] = 0x80;
-pixels[(2 * rowstride) + (width * 4) - 1] = 0xC0;
+	pixels[(2 * rowstride) + (width * 4) - 1] = 0xC0;
-/* Bottom left */
+	/* Bottom left */
-pixels[(height - 1) * rowstride + 3] = 0;
+	pixels[(height - 1) * rowstride + 3] = 0;
-pixels[(height - 1) * rowstride + 7] = 0x80;
+	pixels[(height - 1) * rowstride + 7] = 0x80;
-pixels[(height - 1) * rowstride + 11] = 0xC0;
+	pixels[(height - 1) * rowstride + 11] = 0xC0;
-pixels[(height - 2) * rowstride + 3] = 0x80;
+	pixels[(height - 2) * rowstride + 3] = 0x80;
-pixels[(height - 3) * rowstride + 3] = 0xC0;
+	pixels[(height - 3) * rowstride + 3] = 0xC0;
-/* Bottom right */
+	/* Bottom right */
-pixels[height * rowstride - 1] = 0;
+	pixels[height * rowstride - 1] = 0;
-pixels[(height - 1) * rowstride - 1] = 0x80;
+	pixels[(height - 1) * rowstride - 1] = 0x80;
-pixels[(height - 2) * rowstride - 1] = 0xC0;
+	pixels[(height - 2) * rowstride - 1] = 0xC0;
-pixels[height * rowstride - 5] = 0x80;
+	pixels[height * rowstride - 5] = 0x80;
-pixels[height * rowstride - 9] = 0xC0;
+	pixels[height * rowstride - 9] = 0xC0;
 }
 const char *pidgin_get_dim_grey_string(GtkWidget *widget) {
 	static char dim_grey_string[8] = "";
 	GtkStyle *style;
 	                    "{\n"
 	                    "GtkWidget::focus-padding = 0\n"
 	                    "GtkWidget::focus-line-width = 0\n"
 	                    "xthickness = 0\n"
 	                    "ythickness = 0\n"
+	                    "GtkContainer::border-width = 0\n"
+	                    "GtkButton::inner-border = {0, 0, 0, 0}\n"
+	                    "GtkButton::default-border = {0, 0, 0, 0}\n"
 	                    "}\n"
 	                    "widget \"*.pidgin-small-close-button\" style \"pidgin-small-close-button\"");
 #ifdef _WIN32
 	winpidgin_register_win32_url_handlers();

Mercurial > pidgin.yaz

comparison pidgin/gtkutils.c @ 30909:25e200cb3532