mcabber: mcabber/mcabber/xmpp.c comparison

Fix bookmarks losing autojoin attribute

comparison

equal deleted inserted replaced

-:a859ed648638
+:a73ce708c2c9
 }
 }
 return NULL;
 }
+int xmpp_get_bookmark_autojoin(const char *bjid)
+{
+LmMessageNode *x;
+if (!bookmarks || !bjid)
+return 0;
+// Walk through the storage bookmark tags
+for (x = bookmarks->children ; x; x = x->next) {
+// If the node is a conference item, check the jid.
+if (x->name && !strcmp(x->name, "conference")) {
+const char *fjid = lm_message_node_get_attribute(x, "jid");
+if (fjid && !strcasecmp(bjid, fjid)) {
+const char *autojoin;
+autojoin = lm_message_node_get_attribute(x, "autojoin");
+if (autojoin && (!strcmp(autojoin, "1") || !strcmp(autojoin, "true")))
+return 1;
+return 0;
+}
+}
+}
+return 0;
+}
 //  xmpp_get_all_storage_bookmarks()
 // Return a GSList with all storage bookmarks.
 // The caller should g_free the list (not the MUC jids).
 GSList *xmpp_get_all_storage_bookmarks(void)
 lm_message_node_set_attributes(x, "autowhois",
 (awhois == autowhois_on) ? "1" : "0",
 NULL);
 if (fjoins)
 lm_message_node_add_child(x, "flag_joins", strflagjoins[fjoins]);
-if (group)
+if (group && *group)
 lm_message_node_add_child(x, "group", group);
 changed = TRUE;
 scr_LogPrint(LPRINT_LOGNORM, "Updating bookmarks...");
 }

Mercurial > ~mikael > mcabber > hg