From fb36ea055301b6db513a31acde30f315e2c0fd68 Mon Sep 17 00:00:00 2001
From: fiaxh <git@mx.ax.lt>
Date: Wed, 16 Aug 2017 11:44:42 +0200
Subject: Message Archive Management

---
 .../contact_details/muc_config_form_provider.vala  | 78 ++++++++++++----------
 1 file changed, 41 insertions(+), 37 deletions(-)

(limited to 'main/src/ui/contact_details')

diff --git a/main/src/ui/contact_details/muc_config_form_provider.vala b/main/src/ui/contact_details/muc_config_form_provider.vala
index 41df4465..438f41c4 100644
--- a/main/src/ui/contact_details/muc_config_form_provider.vala
+++ b/main/src/ui/contact_details/muc_config_form_provider.vala
@@ -34,43 +34,46 @@ public class MucConfigFormProvider : Plugins.ContactDetailsProvider {
     public static void add_field(DataForms.DataForm.Field field, Plugins.ContactDetails contact_details) {
         string label = field.label ?? "";
         string? desc = null;
-        switch (field.var) {
-            case "muc#roomconfig_roomname":
-                label = _("Name of the room");
-                break;
-            case "muc#roomconfig_roomdesc":
-                label = _("Description of the room");
-                break;
-            case "muc#roomconfig_persistentroom":
-                label = _("Persistent");
-                desc = _("The room will persist after the last occupant exits");
-                break;
-            case "muc#roomconfig_publicroom":
-                label = _("Publicly searchable");
-                break;
-            case "muc#roomconfig_changesubject":
-                label = _("Occupants may change subject");
-                break;
-            case "muc#roomconfig_whois":
-                label = _("Discover real JIDs");
-                desc = _("Who may discover real JIDs?");
-                break;
-            case "muc#roomconfig_roomsecret":
-                label = _("Password");
-                desc = _("Password required to enter the room. Leave empty for none");
-                break;
-            case "muc#roomconfig_moderatedroom":
-                label = _("Moderated");
-                desc = _("Only occupants with voice may send messages");
-                break;
-            case "muc#roomconfig_membersonly":
-                label = _("Members only");
-                desc = _("Only members may enter the room");
-                break;
-            case "muc#roomconfig_historylength":
-                label = _("Message history");
-                desc = _("Maximum number of history messages returned by the room");
-                break;
+
+        if (field.var != null) {
+            switch (field.var) {
+                case "muc#roomconfig_roomname":
+                    label = _("Name of the room");
+                    break;
+                case "muc#roomconfig_roomdesc":
+                    label = _("Description of the room");
+                    break;
+                case "muc#roomconfig_persistentroom":
+                    label = _("Persistent");
+                    desc = _("The room will persist after the last occupant exits");
+                    break;
+                case "muc#roomconfig_publicroom":
+                    label = _("Publicly searchable");
+                    break;
+                case "muc#roomconfig_changesubject":
+                    label = _("Occupants may change subject");
+                    break;
+                case "muc#roomconfig_whois":
+                    label = _("Discover real JIDs");
+                    desc = _("Who may discover real JIDs?");
+                    break;
+                case "muc#roomconfig_roomsecret":
+                    label = _("Password");
+                    desc = _("Password required to enter the room. Leave empty for none");
+                    break;
+                case "muc#roomconfig_moderatedroom":
+                    label = _("Moderated");
+                    desc = _("Only occupants with voice may send messages");
+                    break;
+                case "muc#roomconfig_membersonly":
+                    label = _("Members only");
+                    desc = _("Only members may enter the room");
+                    break;
+                case "muc#roomconfig_historylength":
+                    label = _("Message history");
+                    desc = _("Maximum number of history messages returned by the room");
+                    break;
+            }
         }
 
         Widget? widget = get_widget(field);
@@ -78,6 +81,7 @@ public class MucConfigFormProvider : Plugins.ContactDetailsProvider {
     }
 
     private static Widget? get_widget(DataForms.DataForm.Field field) {
+        if (field.type_ == null) return null;
         switch (field.type_) {
             case DataForms.DataForm.Type.BOOLEAN:
                 DataForms.DataForm.BooleanField boolean_field = field as DataForms.DataForm.BooleanField;
-- 
cgit v1.2.3-54-g00ecf