/pidgin/main: 5bf77d8efc26: merging

[Gary Kramlich]

Changeset: 5bf77d8efc26af5cad7e162141b473065ad5cce6
Author:	 Gary Kramlich <grim at reaperworld.com>
Date:	 2013-01-16 23:21 -0600
Branch:	 default
URL: http://hg.pidgin.im/pidgin/main/rev/5bf77d8efc26

Description:

merging

diffstat:

 libpurple/protocols/msn/notification.c                 |  2 +-
 pidgin/gtkconv.c                                       |  2 +-
 pidgin/gtkprefs.c                                      |  5 ++---
 pidgin/plugins/disco/xmppdisco.c                       |  2 +-
 pidgin/themes/Contents/Resources/Content.html          |  4 ++--
 pidgin/themes/Contents/Resources/Incoming/Content.html |  8 ++++----
 pidgin/themes/Contents/Resources/main.css              |  6 ------
 7 files changed, 11 insertions(+), 18 deletions(-)

diffs (96 lines):

diff --git a/libpurple/protocols/msn/notification.c b/libpurple/protocols/msn/notification.c
--- a/libpurple/protocols/msn/notification.c
+++ b/libpurple/protocols/msn/notification.c
@@ -1592,7 +1592,7 @@ parse_user_endpoints(MsnUser *user, xmln
 		/* Disconnect others, if MPOP is disabled */
 		if (is_me
 		 && !session->enable_mpop
-		 && strncasecmp(id + 1, session->guid, 36) != 0) {
+		 && g_ascii_strncasecmp(id + 1, session->guid, 36) != 0) {
 			purple_debug_info("msn", "Disconnecting Endpoint %s\n", id);
 
 			tmp = g_strdup_printf("%s;%s", user->passport, id);
diff --git a/pidgin/gtkconv.c b/pidgin/gtkconv.c
--- a/pidgin/gtkconv.c
+++ b/pidgin/gtkconv.c
@@ -10226,7 +10226,7 @@ set_default_tab_colors(GtkWidget *widget
 	gtk_css_provider_load_from_data(provider, str->str, str->len, &error);
 
 	gtk_style_context_add_provider(gtk_widget_get_style_context(widget),
-	                               provider,
+	                               GTK_STYLE_PROVIDER(provider),
 	                               GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
 
 	if (error)
diff --git a/pidgin/gtkprefs.c b/pidgin/gtkprefs.c
--- a/pidgin/gtkprefs.c
+++ b/pidgin/gtkprefs.c
@@ -3401,10 +3401,9 @@ toggle_voice_test_cb(GtkToggleButton *te
 }
 
 static void
-volume_changed_cb(GtkScaleButton *button, gpointer data)
+volume_changed_cb(GtkScaleButton *button, gdouble value, gpointer data)
 {
-	purple_prefs_set_int("/purple/media/audio/volume/input",
-	                     gtk_scale_button_get_value(GTK_SCALE_BUTTON(button)) * 100);
+	purple_prefs_set_int("/purple/media/audio/volume/input", value * 100);
 }
 
 static void
diff --git a/pidgin/plugins/disco/xmppdisco.c b/pidgin/plugins/disco/xmppdisco.c
--- a/pidgin/plugins/disco/xmppdisco.c
+++ b/pidgin/plugins/disco/xmppdisco.c
@@ -265,7 +265,7 @@ disco_type_from_string(const gchar *str)
 	g_return_val_if_fail(str != NULL, "");
 
 	for ( ; disco_type_mappings[i].from; ++i) {
-		if (!strcasecmp(str, disco_type_mappings[i].from))
+		if (!g_ascii_strcasecmp(str, disco_type_mappings[i].from))
 			return disco_type_mappings[i].to;
 	}
 
diff --git a/pidgin/themes/Contents/Resources/Content.html b/pidgin/themes/Contents/Resources/Content.html
--- a/pidgin/themes/Contents/Resources/Content.html
+++ b/pidgin/themes/Contents/Resources/Content.html
@@ -1,6 +1,6 @@
 <div class="x-container %messageClasses% %messageDirection%">
 	<abbr class="x-time" title="%time{yyyy-MM-ddTHH:mm:ssZZ}%">(%time%)</abbr>
-	<div class="x-sender" style="float: left">%sender%:</div>
-	<div class="x-message">%message%</div>
+	<span class="x-sender">%sender%:</span>
+	<span class="x-message">%message%</span>
 </div>
 <div id="insert"></div>
diff --git a/pidgin/themes/Contents/Resources/Incoming/Content.html b/pidgin/themes/Contents/Resources/Incoming/Content.html
--- a/pidgin/themes/Contents/Resources/Incoming/Content.html
+++ b/pidgin/themes/Contents/Resources/Incoming/Content.html
@@ -1,8 +1,8 @@
 <div class="x-container %messageClasses% %messageDirection%">
-	<div class="x-header" style="color: %senderColor%;">
+	<span class="x-header" style="color: %senderColor%;">
 		<abbr class="x-time" title="%time{yyyy-MM-ddTHH:mm:ssZZ}%">(%time%)</abbr>
-		<div class="x-sender">%sender%:</div>
-	</div>
-	<div class="x-message">%message%</div>
+		<span class="x-sender">%sender%:</span>
+	</span>
+	<span class="x-message">%message%</span>
 </div>
 <div id="insert"></div>
diff --git a/pidgin/themes/Contents/Resources/main.css b/pidgin/themes/Contents/Resources/main.css
--- a/pidgin/themes/Contents/Resources/main.css
+++ b/pidgin/themes/Contents/Resources/main.css
@@ -29,12 +29,6 @@ body {
 	font-weight: bold;
 }
 
-.x-time, .x-sender
-{
-	float: left;
-	margin-right: 4px;
-}
-
 .x-message p
 {
 	margin: 0;