Mercurial > pidgin3 / changeset

--- a/libpurple/plugins/tcl/tcl_cmds.c	Wed Apr 17 20:16:47 2013 +0200
+++ b/libpurple/plugins/tcl/tcl_cmds.c	Wed Apr 17 22:16:09 2013 +0200
@@ -1516,7 +1516,8 @@
 	PurpleStatus *status;
 	PurpleStatusType *status_type;
 	int error;
-#if !(defined PURPLE_DISABLE_DEPRECATED)
+# if (0)
+/* #if !(defined PURPLE_DISABLE_DEPRECATED) */
 	PurpleValue *value;
 	const char *attr;
 	int v;

--- a/libpurple/protocols/myspace/myspace.c	Wed Apr 17 20:16:47 2013 +0200
+++ b/libpurple/protocols/myspace/myspace.c	Wed Apr 17 22:16:09 2013 +0200
@@ -1842,11 +1842,11 @@
 					gchar *suggestion;
 
 					suggestion = g_strdup_printf(_("%s Your password is "
-							"%zu characters, which is longer than the "
+							"%" G_GSIZE_FORMAT " characters, which is longer than the "
 							"maximum length of %d.  Please shorten your "
 							"password at http://profileedit.myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try again."),
 							full_errmsg,
-							strlen(purple_account_get_password(session->account)),
+							(gsize)strlen(purple_account_get_password(session->account)),
 							MSIM_MAX_PASSWORD_LENGTH);
 
 					/* Replace full_errmsg. */

--- a/libpurple/protocols/silc/ops.c	Wed Apr 17 20:16:47 2013 +0200
+++ b/libpurple/protocols/silc/ops.c	Wed Apr 17 22:16:09 2013 +0200
@@ -1170,7 +1170,7 @@
 
 	case SILC_COMMAND_WHOIS:
 		{
-			SilcUInt32 idle, *user_modes;
+			SilcUInt32 *user_modes;
 			SilcDList channels;
 			SilcClientEntry client_entry;
 			char tmp[1024];
@@ -1190,7 +1190,7 @@
 			(void)va_arg(ap, char *);
 			channels = va_arg(ap, SilcDList);
 			(void)va_arg(ap, SilcUInt32);
-			idle = va_arg(ap, SilcUInt32);
+			(void)va_arg(ap, SilcUInt32); /* idle */
 			(void)va_arg(ap, unsigned char *);
 			user_modes = va_arg(ap, SilcUInt32 *);
 

--- a/libpurple/protocols/silc/silc.c	Wed Apr 17 20:16:47 2013 +0200
+++ b/libpurple/protocols/silc/silc.c	Wed Apr 17 22:16:09 2013 +0200
@@ -919,7 +919,9 @@
 		mbored = FALSE, mexcited = FALSE, manxious = FALSE;
 	gboolean cemail = FALSE, ccall = FALSE, csms = FALSE,
 		cmms = FALSE, cchat = TRUE, cvideo = FALSE;
+#ifdef HAVE_SYS_UTSNAME_H
 	gboolean device = TRUE;
+#endif
 	char status[1024], tz[16];
 
 	sg = purple_connection_get_protocol_data(gc);
@@ -967,10 +969,12 @@
 					 NULL, (void *)&attr))
 			silc_attribute_get_object(attr, &status, sizeof(status));
 
+#ifdef HAVE_SYS_UTSNAME_H
 		if (!silc_hash_table_find(attrs,
 					  SILC_32_TO_PTR(SILC_ATTRIBUTE_DEVICE_INFO),
 					  NULL, (void *)&attr))
 			device = FALSE;
+#endif
 	}
 
 	fields = purple_request_fields_new();

--- a/pidgin/gtkprefs.c	Wed Apr 17 20:16:47 2013 +0200
+++ b/pidgin/gtkprefs.c	Wed Apr 17 22:16:09 2013 +0200
@@ -2740,7 +2740,10 @@
 sound_page(void)
 {
 	GtkWidget *ret;
-	GtkWidget *vbox, *vbox2, *sw, *button, *parent, *parent_parent, *parent_parent_parent;
+	GtkWidget *vbox, *vbox2, *button, *parent, *parent_parent, *parent_parent_parent;
+#ifdef USE_GSTREAMER
+	GtkWidget *sw;
+#endif
 	GtkSizeGroup *sg;
 	GtkTreeIter iter;
 	GtkWidget *event_view;

--- a/pidgin/gtkstatusbox.c	Wed Apr 17 20:16:47 2013 +0200
+++ b/pidgin/gtkstatusbox.c	Wed Apr 17 22:16:09 2013 +0200
@@ -2326,15 +2326,15 @@
 				&error) || error)
 		{
 			purple_debug_warning("gtkstatusbox", "gdk_pixbuf_loader_write() "
-					"failed with size=%zu: %s\n",
-					purple_imgstore_get_size(status_box->buddy_icon_img),
+					"failed with size=%" G_GSIZE_FORMAT ": %s\n",
+					(gsize)purple_imgstore_get_size(status_box->buddy_icon_img),
 					error ? error->message : "(no error message)");
 			if (error)
 				g_error_free(error);
 		} else if (!gdk_pixbuf_loader_close(loader, &error) || error) {
 			purple_debug_warning("gtkstatusbox", "gdk_pixbuf_loader_close() "
-					"failed for image of size %zu: %s\n",
-					purple_imgstore_get_size(status_box->buddy_icon_img),
+					"failed for image of size %" G_GSIZE_FORMAT ": %s\n",
+					(gsize)purple_imgstore_get_size(status_box->buddy_icon_img),
 					error ? error->message : "(no error message)");
 			if (error)
 				g_error_free(error);