Changeset 7a9d968 for protocols/nogaim.c

Timestamp:

2018-03-10T11:30:39Z (7 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

5447c59

Parents:

3f44e43 (diff), 4a9c6b0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into HEAD

File:

• protocols/nogaim.c (modified) (6 diffs)

protocols/nogaim.c

@@ -50 +50 @@
 }
 
+/* semi-private */
+gboolean plugin_info_validate(struct plugin_info *info, const char *path)
+{
+        GList *l;
+        gboolean loaded = FALSE;
+
+        if (!path) {
+                path = "(null)";
+        }
+
+        if (info->abiver != BITLBEE_ABI_VERSION_CODE) {
+                log_message(LOGLVL_ERROR,
+                            "`%s' uses ABI %u but %u is required\n",
+                            path, info->abiver,
+                            BITLBEE_ABI_VERSION_CODE);
+                return FALSE;
+        }
+
+        if (!info->name || !info->version) {
+                log_message(LOGLVL_ERROR,
+                            "Name or version missing from the "
+                            "plugin info in `%s'\n", path);
+                return FALSE;
+        }
+
+        for (l = plugins; l; l = l->next) {
+                struct plugin_info *i = l->data;
+
+                if (g_strcasecmp(i->name, info->name) == 0) {
+                        loaded = TRUE;
+                        break;
+                }
+        }
+
+        if (loaded) {
+                log_message(LOGLVL_WARNING,
+                            "%s plugin already loaded\n",
+                            info->name);
+                return FALSE;
+        }
+
+        return TRUE;
+}
+
+/* semi-private */
+gboolean plugin_info_add(struct plugin_info *info)
+{
+        plugins = g_list_insert_sorted_with_data(plugins, info, pluginscmp, NULL);
+        return TRUE;
+}
+
 gboolean load_plugin(char *path)
 {
-        GList *l;
-        struct plugin_info *i;
-        struct plugin_info *info;
+        struct plugin_info *info = NULL;
         struct plugin_info * (*info_function) (void) = NULL;
         void (*init_function) (void);
 
         GModule *mod = g_module_open(path, G_MODULE_BIND_LAZY);
-        gboolean loaded = FALSE;
 
         if (!mod) {
@@ -69 +117 @@
                 info = info_function();
 
-                if (info->abiver != BITLBEE_ABI_VERSION_CODE) {
-                        log_message(LOGLVL_ERROR,
-                                    "`%s' uses ABI %u but %u is required\n",
-                                    path, info->abiver,
-                                    BITLBEE_ABI_VERSION_CODE);
-                        g_module_close(mod);
-                        return FALSE;
-                }
-
-                if (!info->name || !info->version) {
-                        log_message(LOGLVL_ERROR,
-                                    "Name or version missing from the "
-                                    "plugin info in `%s'\n", path);
-                        g_module_close(mod);
-                        return FALSE;
-                }
-
-                for (l = plugins; l; l = l->next) {
-                        i = l->data;
-
-                        if (g_strcasecmp(i->name, info->name) == 0) {
-                                loaded = TRUE;
-                                break;
-                        }
-                }
-
-                if (loaded) {
-                        log_message(LOGLVL_WARNING,
-                                    "%s plugin already loaded\n",
-                                    info->name);
+                if (!plugin_info_validate(info, path)) {
                         g_module_close(mod);
                         return FALSE;
@@ -113 +132 @@
 
         if (info_function) {
-                plugins = g_list_insert_sorted_with_data(plugins, info,
-                                                         pluginscmp, NULL);
+                plugin_info_add(info);
         }
 
@@ -797 +815 @@
                 msg = ic->acc->flags & ACC_FLAG_AWAY_MESSAGE ? away : NULL;
                 away = imc_away_state_find(m, away, &msg) ? :
-                       (imc_away_state_find(m, "away", &msg) ? : m->data);
+                       (imc_away_state_find(m, "away", NULL) ? : m->data);
         } else if (ic->acc->flags & ACC_FLAG_STATUS_MESSAGE) {
                 away = NULL;
@@ -831 +849 @@
                            contains no data unless it adds something to what
                            we have in state already. */
-                        if (strlen(m->data) == strlen(away)) {
+                        if (message && strlen(m->data) == strlen(away)) {
                                 *message = NULL;
                         }
@@ -857 +875 @@
                         for (m = gcm; m; m = m->next) {
                                 if (g_strcasecmp(imc_away_alias_list[i][j], m->data) == 0) {
-                                        if (!keep_message) {
+                                        if (!keep_message && message) {
                                                 *message = NULL;
                                         }