/pidgin/main: e4a6b908d4ac: Try to fix a clang warning

Tomasz Wasilczyk twasilczyk at pidgin.im
Sun Dec 7 06:14:14 EST 2014


Changeset: e4a6b908d4acb3e85071d554be8e621fa0e9e024
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2014-12-07 12:14 +0100
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/e4a6b908d4ac

Description:

Try to fix a clang warning

diffstat:

 pidgin/gtkutils.c |  27 ++++++++++++++-------------
 1 files changed, 14 insertions(+), 13 deletions(-)

diffs (38 lines):

diff --git a/pidgin/gtkutils.c b/pidgin/gtkutils.c
--- a/pidgin/gtkutils.c
+++ b/pidgin/gtkutils.c
@@ -1530,20 +1530,21 @@ pidgin_dnd_file_manage(GtkSelectionData 
 			else if (prpl_info && prpl_info->send_file)
 				ft = TRUE;
 
-			if (im && ft)
+			if (im && ft) {
 				purple_request_choice(NULL, NULL,
-						    _("You have dragged an image"),
-						    _("You can send this image as a file transfer, "
-						      "embed it into this message, or use it as the buddy icon for this user."),
-						    DND_FILE_TRANSFER, _("OK"), (GCallback)dnd_image_ok_callback,
-						    _("Cancel"), (GCallback)dnd_image_cancel_callback,
-							purple_request_cpar_from_account(account),
-							data,
-							_("Set as buddy icon"), DND_BUDDY_ICON,
-						    _("Send image file"), DND_FILE_TRANSFER,
-						    _("Insert in message"), DND_IM_IMAGE,
-							NULL);
-			else if (!(im || ft))
+					_("You have dragged an image"),
+					_("You can send this image as a file "
+					"transfer, embed it into this message, "
+					"or use it as the buddy icon for this user."),
+					(gpointer)DND_FILE_TRANSFER, _("OK"),
+					(GCallback)dnd_image_ok_callback, _("Cancel"),
+					(GCallback)dnd_image_cancel_callback,
+					purple_request_cpar_from_account(account), data,
+					_("Set as buddy icon"), DND_BUDDY_ICON,
+					_("Send image file"), DND_FILE_TRANSFER,
+					_("Insert in message"), DND_IM_IMAGE,
+					NULL);
+			} else if (!(im || ft))
 				purple_request_yes_no(NULL, NULL, _("You have dragged an image"),
 							_("Would you like to set it as the buddy icon for this user?"),
 							PURPLE_DEFAULT_ACTION_NONE,



More information about the Commits mailing list