diff options
| author | Eion Robb <eion@robbmob.com> | 2015-07-28 14:55:14 +0300 |
|---|---|---|
| committer | Eion Robb <eion@robbmob.com> | 2015-07-28 14:55:14 +0300 |
| commit | aab15d600357e185d2848a22b68b3a8bb078f7c1 (patch) | |
| tree | 37490271fc328e508a8699757f3046b8cbd4bf8d | |
| parent | cf7f51e6024e18397b2f80ed33c5c6f73f1df777 (diff) | |
SkypeWeb : Remove a json-critical notice from debug output (see issue #313)
| -rw-r--r-- | skypeweb/skypeweb_messages.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/skypeweb/skypeweb_messages.c b/skypeweb/skypeweb_messages.c index 4be93f5..4a95c25 100644 --- a/skypeweb/skypeweb_messages.c +++ b/skypeweb/skypeweb_messages.c @@ -103,10 +103,12 @@ process_message_resource(SkypeWebAccount *sa, JsonObject *resource) if (!chatconv) {
chatconv = purple_serv_got_joined_chat(sa->pc, g_str_hash(chatname), chatname);
purple_conversation_set_data(PURPLE_CONVERSATION(chatconv), "chatname", g_strdup(chatname));
-
- topic = json_object_get_string_member(resource, "threadtopic");
- purple_chat_conversation_set_topic(chatconv, NULL, topic);
-
+
+ if (json_object_has_member(resource, "threadtopic")) {
+ topic = json_object_get_string_member(resource, "threadtopic");
+ purple_chat_conversation_set_topic(chatconv, NULL, topic);
+ }
+
skypeweb_get_conversation_history(sa, chatname);
skypeweb_get_thread_users(sa, chatname);
}
|