/soc/2013/ankitkv/gobjectification: c823cbd72743: Merged soc.201...

[Ankit Vani]

Changeset: c823cbd727431bc4584956974f83215b1af42c0c
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-10-20 20:05 +0530
Branch:	 soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/c823cbd72743

Description:

Merged soc.2013.gobjectification branch

diffstat:

 libpurple/protocols/gg/oauth/oauth.c  |  2 +-
 libpurple/protocols/gg/oauth/oauth.h  |  2 +-
 libpurple/protocols/jabber/message.h  |  2 +-
 libpurple/protocols/myspace/message.c |  2 +-
 pidgin/gtkblist.c                     |  2 +-
 pidgin/gtkcellrendererexpander.c      |  2 +-
 pidgin/plugins/ticker/gtkticker.c     |  2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diffs (82 lines):

diff --git a/libpurple/protocols/gg/oauth/oauth.c b/libpurple/protocols/gg/oauth/oauth.c
--- a/libpurple/protocols/gg/oauth/oauth.c
+++ b/libpurple/protocols/gg/oauth/oauth.c
@@ -92,7 +92,7 @@ static char *gg_oauth_generate_signature
 	return res;
 }
 
-char *gg_oauth_generate_header(const char *method, const char *url, const const char *consumer_key, const char *consumer_secret, const char *token, const char *token_secret)
+char *gg_oauth_generate_header(const char *method, const char *url, const char *consumer_key, const char *consumer_secret, const char *token, const char *token_secret)
 {
 	char *request, *signature, *res;
 	char nonce[80], timestamp[16];
diff --git a/libpurple/protocols/gg/oauth/oauth.h b/libpurple/protocols/gg/oauth/oauth.h
--- a/libpurple/protocols/gg/oauth/oauth.h
+++ b/libpurple/protocols/gg/oauth/oauth.h
@@ -29,6 +29,6 @@
 #include <internal.h>
 #include <libgadu.h>
 
-char *gg_oauth_generate_header(const char *method, const char *url, const const char *consumer_key, const char *consumer_secret, const char *token, const char *token_secret);
+char *gg_oauth_generate_header(const char *method, const char *url, const char *consumer_key, const char *consumer_secret, const char *token, const char *token_secret);
 
 #endif /* _GGP_OAUTH_H */
diff --git a/libpurple/protocols/jabber/message.h b/libpurple/protocols/jabber/message.h
--- a/libpurple/protocols/jabber/message.h
+++ b/libpurple/protocols/jabber/message.h
@@ -77,6 +77,6 @@ unsigned int jabber_send_typing(PurpleCo
 
 gboolean jabber_buzz_isenabled(JabberStream *js, const gchar *namespace);
 
-gboolean jabber_custom_smileys_isenabled(JabberStream *js, const const gchar *namespace);
+gboolean jabber_custom_smileys_isenabled(JabberStream *js, const gchar *namespace);
 
 #endif /* PURPLE_JABBER_MESSAGE_H_ */
diff --git a/libpurple/protocols/myspace/message.c b/libpurple/protocols/myspace/message.c
--- a/libpurple/protocols/myspace/message.c
+++ b/libpurple/protocols/myspace/message.c
@@ -819,7 +819,7 @@ msim_msg_pack_element_dict(gpointer data
 
 		default:
 			g_free(data_string);
-			g_return_if_fail(FALSE);
+			g_return_if_reached();
 			break;
 	}
 
diff --git a/pidgin/gtkblist.c b/pidgin/gtkblist.c
--- a/pidgin/gtkblist.c
+++ b/pidgin/gtkblist.c
@@ -576,7 +576,7 @@ static void gtk_blist_renderer_edited_cb
 	GtkTreePath *path;
 	PurpleBlistNode *node;
 	PurpleGroup *dest;
-	gchar *alias;
+	gchar *alias = NULL;
 
 	editing_blist = FALSE;
 	path = gtk_tree_path_new_from_string (arg1);
diff --git a/pidgin/gtkcellrendererexpander.c b/pidgin/gtkcellrendererexpander.c
--- a/pidgin/gtkcellrendererexpander.c
+++ b/pidgin/gtkcellrendererexpander.c
@@ -304,7 +304,7 @@ pidgin_cell_renderer_expander_render(Gtk
 	context = gtk_widget_get_style_context(widget);
 	gtk_style_context_add_class(context, GTK_STYLE_CLASS_VIEW);
 	gtk_style_context_add_class(context, GTK_STYLE_CLASS_EXPANDER);
-	gtk_style_context_set_state(context, state);
+	gtk_style_context_set_state(context, (GtkStateFlags)state);
 	gtk_render_expander(context, cr,
 	                    cell_area->x + xpad, cell_area->y + ypad,
 	                    width, height);
diff --git a/pidgin/plugins/ticker/gtkticker.c b/pidgin/plugins/ticker/gtkticker.c
--- a/pidgin/plugins/ticker/gtkticker.c
+++ b/pidgin/plugins/ticker/gtkticker.c
@@ -302,7 +302,7 @@ static void gtk_ticker_realize (GtkWidge
 #if GTK_CHECK_VERSION(3,0,0)
 	context = gtk_widget_get_style_context(widget);
 	gtk_style_context_add_class(context, GTK_STYLE_CLASS_BACKGROUND);
-	gtk_style_context_set_state(context, GTK_STATE_NORMAL);
+	gtk_style_context_set_state(context, GTK_STATE_FLAG_NORMAL);
 	gtk_style_context_set_background(context, window);
 #else
 	style = gtk_style_attach (gtk_widget_get_style (widget), window);