Clean up build warnings

Fixes issue #533

3 files changed, 12 insertions, 13 deletions

diff --git a/skypeweb/libskypeweb.c b/skypeweb/libskypeweb.c
index 162b23b..14f3708 100644
--- a/skypeweb/libskypeweb.c
+++ b/skypeweb/libskypeweb.c
@@ -115,12 +115,12 @@ skypeweb_tooltip_text(PurpleBuddy *buddy, PurpleNotifyUserInfo *user_info, gbool
 		}

 			

 		if (sbuddy->display_name && *sbuddy->display_name) {

-			gchar *escaped = g_markup_printf_escaped(sbuddy->display_name);

+			gchar *escaped = g_markup_printf_escaped("%s", sbuddy->display_name);

 			purple_notify_user_info_add_pair_html(user_info, "Alias", escaped);

 			g_free(escaped);

 		}

 		if (sbuddy->fullname && *sbuddy->fullname) {

-			gchar *escaped = g_markup_printf_escaped(sbuddy->display_name);

+			gchar *escaped = g_markup_printf_escaped("%s", sbuddy->display_name);

 			purple_notify_user_info_add_pair_html(user_info, "Full Name", sbuddy->fullname);

 			g_free(escaped);

 		}

diff --git a/skypeweb/skypeweb_contacts.c b/skypeweb/skypeweb_contacts.c
index 1b6e486..44ed1f9 100644
--- a/skypeweb/skypeweb_contacts.c
+++ b/skypeweb/skypeweb_contacts.c
@@ -1163,9 +1163,9 @@ skypeweb_got_info(SkypeWebAccount *sa, JsonNode *node, gpointer user_data)
 		// Can be presented as either a string of a number or as a number argh

 		if (json_node_get_value_type(json_object_get_member(userobj, "gender")) == G_TYPE_STRING) {

 			const gchar *gender = json_object_get_string_member(userobj, "gender");

-			if (*gender == '1') {

+			if (gender && *gender == '1') {

 				gender_output = _("Male");

-			} else if (*gender == '2') {

+			} else if (gender && *gender == '2') {

 				gender_output = _("Female");

 			}

 		} else {

@@ -1360,12 +1360,9 @@ skypeweb_get_friend_list_cb(SkypeWebAccount *sa, JsonNode *node, gpointer user_d
 void

 skypeweb_get_friend_list(SkypeWebAccount *sa)

 {

-	gchar *url;

+	const gchar *url = "/contacts/v2/users/SELF?delta=&reason=default";

 	

-	url = g_strdup_printf("/contacts/v2/users/SELF?delta=&reason=default", purple_url_encode(sa->username));

 	skypeweb_post_or_get(sa, SKYPEWEB_METHOD_GET | SKYPEWEB_METHOD_SSL, SKYPEWEB_NEW_CONTACTS_HOST, url, NULL, skypeweb_get_friend_list_cb, NULL, TRUE);

-	

-	g_free(url);

 }

 

 

diff --git a/skypeweb/skypeweb_messages.c b/skypeweb/skypeweb_messages.c
index 5b6a163..f494c58 100644
--- a/skypeweb/skypeweb_messages.c
+++ b/skypeweb/skypeweb_messages.c
@@ -141,7 +141,7 @@ process_message_resource(SkypeWebAccount *sa, JsonObject *resource)
 	if (json_object_has_member(resource, "content"))

 		content = json_object_get_string_member(resource, "content");

 	

-	if (strstr(conversationLink, "/19:")) {

+	if (conversationLink && strstr(conversationLink, "/19:")) {

 		// This is a Thread/Group chat message

 		const gchar *chatname, *topic;

 		PurpleChatConversation *chatconv;

@@ -216,8 +216,9 @@ process_message_resource(SkypeWebAccount *sa, JsonObject *resource)
 			PurpleChatUserFlags cbflags;

 			PurpleChatUser *cb;

 			

-			if (json_object_has_member(resource, "skypeemoteoffset"))

-				skypeemoteoffset = atoi(json_object_get_string_member(resource, "skypeemoteoffset"));

+			if (json_object_has_member(resource, "skypeemoteoffset")) {

+				skypeemoteoffset = g_ascii_strtoll(json_object_get_string_member(resource, "skypeemoteoffset"), NULL, 10);

+			}

 			

 			from = skypeweb_contact_url_to_name(from);

 			g_return_if_fail(from);

@@ -357,8 +358,9 @@ process_message_resource(SkypeWebAccount *sa, JsonObject *resource)
 			gint64 skypeemoteoffset = 0;

 			PurpleIMConversation *imconv;

 			

-			if (json_object_has_member(resource, "skypeemoteoffset"))

-				skypeemoteoffset = atoi(json_object_get_string_member(resource, "skypeemoteoffset"));

+			if (json_object_has_member(resource, "skypeemoteoffset")) {

+				skypeemoteoffset = g_ascii_strtoll(json_object_get_string_member(resource, "skypeemoteoffset"), NULL, 10);

+			}

 			

 			if (g_str_equal(messagetype, "Text")) {

 				gchar *temp = skypeweb_meify(content, skypeemoteoffset);