Fixed a bug adding masks in requested attributes.

diff --git a/apps/irssi/src/fe-common/silc/module-formats.c b/apps/irssi/src/fe-common/silc/module-formats.c
index 7e8a2315bea5aa2c166d1f852413aa518f7f8ae2..c1521c31c558d91606b21c5e75c82998506103e7 100644 (file)
--- a/apps/irssi/src/fe-common/silc/module-formats.c
+++ b/apps/irssi/src/fe-common/silc/module-formats.c
@@ -164,7 +164,7 @@ FORMAT_REC fecommon_silc_formats[] = {
        { "attr_status_text", " User's message     : $0", 1, { 0 } },
        { "attr_status_message",      " User's message     : $0", 1, { 0 } },
        { "attr_status_message_file", " Message file       : $0", 1, { 0 } },
-       { "attr_preferred_language",  " Preferred langauge : $0", 1, { 0 } },
+       { "attr_preferred_language",  " Preferred language : $0", 1, { 0 } },
        { "attr_preferred_contact",   " Preferred contact  : $0", 1, { 0 } },
        { "attr_geolocation",    " Geolocation        : $0", 1, { 0 } },
        { "attr_device_info",    " Device Info        : $0", 1, { 0 } },

diff --git a/apps/irssi/src/silc/core/silc-queries.c b/apps/irssi/src/silc/core/silc-queries.c
index bf23d870adbc974a82dc0785613fd70824e37761..65caad74c499a8883b467d4feea5af5940d60fd5 100644 (file)
--- a/apps/irssi/src/silc/core/silc-queries.c
+++ b/apps/irssi/src/silc/core/silc-queries.c
@@ -176,7 +176,7 @@ void command_attr(const char *data, SILC_SERVER_REC *server,
       silc_client_attribute_del(silc_client, server->conn,
                                SILC_ATTRIBUTE_STATUS_MESSAGE, NULL);
       settings_set_str("attr_status_message", "");
-    } else if (!strcasecmp(argv[1], "preferred_langauge")) {
+    } else if (!strcasecmp(argv[1], "preferred_language")) {
       silc_client_attribute_del(silc_client, server->conn,
                                SILC_ATTRIBUTE_PREFERRED_LANGUAGE, NULL);
       settings_set_str("attr_preferred_language", "");
@@ -218,7 +218,7 @@ void command_attr(const char *data, SILC_SERVER_REC *server,
     settings_set_str("attr_status_text", argv[2]);
   } else if (!strcasecmp(argv[1], "status_message")) {
     settings_set_str("attr_status_message", argv[2]);
-  } else if (!strcasecmp(argv[1], "preferred_langauge")) {
+  } else if (!strcasecmp(argv[1], "preferred_language")) {
     settings_set_str("attr_preferred_language", argv[2]);
   } else if (!strcasecmp(argv[1], "preferred_contact")) {
     settings_set_str("attr_preferred_contact", argv[2]);
@@ -334,10 +334,10 @@ void silc_query_attributes_default(SilcClient client,
        mask |= SILC_ATTRIBUTE_MOOD_EXCITED;
       if (!strcasecmp(*entry, "ANXIOUS"))
        mask |= SILC_ATTRIBUTE_MOOD_ANXIOUS;
-      silc_client_attribute_add(silc_client, conn,
-                               SILC_ATTRIBUTE_STATUS_MOOD, (void *)mask,
-                               sizeof(SilcUInt32));
     }
+    silc_client_attribute_add(silc_client, conn,
+                             SILC_ATTRIBUTE_STATUS_MOOD, (void *)mask,
+                             sizeof(SilcUInt32));
     g_strfreev(list);
   }
 
@@ -404,10 +404,10 @@ void silc_query_attributes_default(SilcClient client,
        mask |= SILC_ATTRIBUTE_CONTACT_MMS;
       if (!strcasecmp(*entry, "CHAT"))
        mask |= SILC_ATTRIBUTE_CONTACT_CHAT;
-      silc_client_attribute_add(silc_client, conn,
-                               SILC_ATTRIBUTE_PREFERRED_CONTACT, (void *)mask,
-                               sizeof(SilcUInt32));
     }
+    silc_client_attribute_add(silc_client, conn,
+                             SILC_ATTRIBUTE_PREFERRED_CONTACT, (void *)mask,
+                             sizeof(SilcUInt32));
     g_strfreev(list);
   }