e systray: use strv instead of passing max around

Also rename one of the vars to _Names to keep consistent with the other.

SVN revision: 82112

diff --git a/src/modules/systray/e_mod_notifier_host.c b/src/modules/systray/e_mod_notifier_host.c
index e0bf528..b44757a 100644 (file)
--- a/src/modules/systray/e_mod_notifier_host.c
+++ b/src/modules/systray/e_mod_notifier_host.c
@@ -6,12 +6,12 @@
 
 #define ITEM_IFACE "org.kde.StatusNotifierItem"
 
-const char *Category_Name[] = {
-   "unknown", "SystemServices"
+const char *Category_Names[] = {
+   "unknown", "SystemServices", NULL
 };
 
 const char *Status_Names[] = {
-   "unknown", "Active", "Passive", "NeedsAttention"
+   "unknown", "Active", "Passive", "NeedsAttention", NULL
 };
 
 static const char *box_part_name = "e.dbus_notifier.box";

diff --git a/src/modules/systray/e_mod_notifier_host_dbus.c b/src/modules/systray/e_mod_notifier_host_dbus.c
index afc3ad6..526eed4 100644 (file)
--- a/src/modules/systray/e_mod_notifier_host_dbus.c
+++ b/src/modules/systray/e_mod_notifier_host_dbus.c
@@ -8,7 +8,7 @@
 
 #define HOST_REGISTRER "/bla" //TODO check what watcher expect we send to him
 
-extern const char *Category_Name[];
+extern const char *Category_Names[];
 extern const char *Status_Names[];
 
 typedef struct _Notifier_Host_Data {
@@ -44,15 +44,15 @@ notifier_item_find(const char *path, const char *bus_id, Instance_Notifier_Host
 }
 
 static int
-id_find(const char *text, const char *array_of_names[], unsigned max)
+id_find(const char *s, const char *names[])
 {
    unsigned i;
-   for (i = 0; i < max; i++)
+
+   for (i = 0; names[i]; i++)
      {
-        if (strcmp(text, array_of_names[i]))
-          continue;
-        return i;
-      }
+        if (!strcmp(s, names[i]))
+          return i;
+     }
    return 0;
 }
 
@@ -65,7 +65,7 @@ item_prop_get(void *data, const void *key, EDBus_Message_Iter *var)
      {
         const char *category;
         edbus_message_iter_arguments_get(var, "s", &category);
-        item->category = id_find(category, Category_Name, CATEGORY_LAST);
+        item->category = id_find(category, Category_Names);
      }
    else if (!strcmp(key, "IconName"))
      {
@@ -95,7 +95,7 @@ item_prop_get(void *data, const void *key, EDBus_Message_Iter *var)
      {
         const char *status;
         edbus_message_iter_arguments_get(var, "s", &status);
-        item->status = id_find(status, Status_Names, STATUS_LAST);
+        item->status = id_find(status, Status_Names);
      }
    else if (!strcmp(key, "Id"))
      {
@@ -283,7 +283,7 @@ new_status_cb(void *data, const EDBus_Message *msg)
         ERR("Error reading message.");
         return;
      }
-   item->status = id_find(status, Status_Names, STATUS_LAST);
+   item->status = id_find(status, Status_Names);
    systray_notifier_item_update(item);
 }