Changes in protocols/twitter/twitter.c [33528bd:c43146d]

File:

• protocols/twitter/twitter.c (modified) (2 diffs)

protocols/twitter/twitter.c

@@ -483 +483 @@
 }
 
-int twitter_message_len(gchar *msg, int target_len)
-{
+static gboolean twitter_length_check(struct im_connection *ic, gchar * msg)
+{
+        int max = set_getint(&ic->acc->set, "message_length"), len;
+        int target_len = set_getint(&ic->acc->set, "target_url_length");
         int url_len_diff = 0;
 
@@ -491 +493 @@
         }
 
-        return g_utf8_strlen(msg, -1) + url_len_diff;
-}
-
-static gboolean twitter_length_check(struct im_connection *ic, gchar * msg)
-{
-        int max = set_getint(&ic->acc->set, "message_length");
-        int target_len = set_getint(&ic->acc->set, "target_url_length");
-        int len = twitter_message_len(msg, target_len);
-
-        if (max == 0 || len <= max) {
+        if (max == 0 || (len = g_utf8_strlen(msg, -1) + url_len_diff) <= max) {
                 return TRUE;
         }