diff options
Diffstat (limited to 'protocols')
| -rw-r--r-- | protocols/purple/purple.c | 4 | ||||
| -rw-r--r-- | protocols/twitter/twitter_lib.c | 19 |
2 files changed, 12 insertions, 11 deletions
diff --git a/protocols/purple/purple.c b/protocols/purple/purple.c index 64faadfb..25cd00cf 100644 --- a/protocols/purple/purple.c +++ b/protocols/purple/purple.c @@ -1808,6 +1808,7 @@ void purple_initmodule() GList *prots; GString *help; char *dir; + gboolean debug_enabled = !!getenv("BITLBEE_DEBUG"); if (purple_get_core() != NULL) { log_message(LOGLVL_ERROR, "libpurple already initialized. " @@ -1826,7 +1827,7 @@ void purple_initmodule() purple_plugins_add_search_path(dir); g_free(dir); - purple_debug_set_enabled(FALSE); + purple_debug_set_enabled(debug_enabled); purple_core_set_ui_ops(&bee_core_uiops); purple_eventloop_set_ui_ops(&glib_eventloops); if (!purple_core_init("BitlBee")) { @@ -1834,6 +1835,7 @@ void purple_initmodule() fprintf(stderr, "libpurple initialization failed.\n"); abort(); } + purple_debug_set_enabled(FALSE); if (proxytype != PROXY_NONE) { PurpleProxyInfo *pi = purple_global_proxy_get_info(); diff --git a/protocols/twitter/twitter_lib.c b/protocols/twitter/twitter_lib.c index a046f35e..4addb650 100644 --- a/protocols/twitter/twitter_lib.c +++ b/protocols/twitter/twitter_lib.c @@ -322,7 +322,7 @@ static gboolean twitter_xt_get_friends_id_list(json_value *node, struct twitter_ } txl->list = g_slist_prepend(txl->list, - g_strdup_printf("%" PRIu64, c->u.array.values[i]->u.integer)); + g_strdup_printf("%" PRId64, c->u.array.values[i]->u.integer)); } c = json_o_get(node, "next_cursor"); @@ -476,7 +476,6 @@ static void twitter_http_get_noretweets_ids(struct http_request *req) } txl = g_new0(struct twitter_xml_list, 1); - // Process the retweet ids txl->type = TXL_ID; if (parsed->type == json_array) { @@ -486,7 +485,7 @@ static void twitter_http_get_noretweets_ids(struct http_request *req) if (c->type != json_integer) { continue; } - g_hash_table_add(td->noretweets_ids, g_strdup_printf("%"PRIu64, c->u.integer)); + g_hash_table_add(td->noretweets_ids, g_strdup_printf("%"PRId64, c->u.integer)); } } @@ -782,7 +781,7 @@ static void expand_entities(char **text, const json_value *node, const json_valu const char *full = json_o_str(v->u.array.values[i], "expanded_url"); char *pos, *new; - /* Skip if a required field is missing, if the t.co URL is not in fact + /* Skip if a required field is missing, if the t.co URL is not in fact in the Tweet at all, or if the full-ish one *is* in it already (dupes appear, especially in streaming API). */ if (!kort || !disp || !(pos = strstr(*text, kort)) || strstr(*text, disp)) { @@ -1023,9 +1022,9 @@ static void twitter_status_show(struct im_connection *ic, struct twitter_xml_sta if (status->user == NULL || status->text == NULL) { return; } - + /* Check this is not a tweet that should be muted */ - uid_str = g_strdup_printf("%" PRIu64, status->user->uid); + uid_str = g_strdup_printf("%" G_GUINT64_FORMAT, status->user->uid); if (g_hash_table_lookup(td->mutes_ids, uid_str) || g_hash_table_lookup(td->blocks_ids, uid_str)) { @@ -1237,23 +1236,23 @@ static gboolean twitter_stream_handle_event(struct im_connection *ic, json_value char *uid_str; int mute = strcmp(type, "mute") == 0; ut = twitter_xt_get_user(target); - uid_str = g_strdup_printf("%" PRIu64, ut->uid); + uid_str = g_strdup_printf("%" G_GUINT64_FORMAT, ut->uid); g_hash_table_add(mute ? td->mutes_ids : td->blocks_ids, uid_str); twitter_log(ic, "%s user %s", mute ? "Muted" : "Blocked", ut->screen_name); if (getenv("BITLBEE_DEBUG")) { - fprintf(stderr, "New mute: %s %"PRIu64"\n", + fprintf(stderr, "New mute: %s %"G_GUINT64_FORMAT"\n", ut->screen_name, ut->uid); } } else if (strcmp(type, "unmute") == 0 || strcmp(type, "unblock") == 0) { char *uid_str; int unmute = strcmp(type, "unmute") == 0; ut = twitter_xt_get_user(target); - uid_str = g_strdup_printf("%" PRIu64, ut->uid); + uid_str = g_strdup_printf("%" G_GUINT64_FORMAT, ut->uid); g_hash_table_remove(unmute ? td->mutes_ids : td->blocks_ids, uid_str); g_free(uid_str); twitter_log(ic, "%s user %s", unmute ? "Unmuted" : "Blocked", ut->screen_name); if (getenv("BITLBEE_DEBUG")) { - fprintf(stderr, "New unmute: %s %"PRIu64"\n", + fprintf(stderr, "New unmute: %s %"G_GUINT64_FORMAT"\n", ut->screen_name, ut->uid); } } |