Changeset 24056 for titan/plugins/callmonitor1

Timestamp:

10/04/13 14:20:24 (11 years ago)

Author:

nit

Message:

[titan] add new plugindir system

Location:

titan/plugins/callmonitor1

Files:

• callmon_main.h (modified) (5 diffs)
• callmonitor1.c (modified) (2 diffs)

titan/plugins/callmonitor1/callmon_main.h

@@ -9 +9 @@
         char* tmpstr = NULL;
         
-        tmpstr = ostrcat(getconfig("pluginpath", NULL), "/callmonitor1/fritzbox_msg_new.sh stop", 0, 0);
+        tmpstr = createpluginpath("/callmonitor1/fritzbox_msg_new.sh", 0);
+        tmpstr = ostrcat(tmpstr, " stop", 1, 0);
         system(tmpstr);
         free(tmpstr); tmpstr = NULL;
@@ -18 +19 @@
                 sleep(1); 
         
-        tmpstr = ostrcat(getconfig("pluginpath", NULL), "/callmonitor1/fritzbox_msg_new.sh start", 0, 0);
+        tmpstr = createpluginpath("/callmonitor1/fritzbox_msg_new.sh", 0);
+        tmpstr = ostrcat(tmpstr, " start", 1, 0);
         system(tmpstr);
         free(tmpstr); tmpstr = NULL;
@@ -46 +48 @@
         struct clist *myconfig[LISTHASHSIZE] = {NULL};
         char* callconf = NULL;
-        callconf = ostrcat(getconfig("pluginpath", NULL), "/callmonitor1/callmon.conf", 0, 0);
+        callconf = createpluginpath("/callmonitor1/callmon.conf", 0);
         readconfig(callconf, myconfig);
                 
@@ -173 +175 @@
                 if(hgreen == 1 || hblue == 1)
                 {       
-                        tmpstr = ostrcat(getconfig("pluginpath", NULL), "/callmonitor1/fritzbox_msg_new.sh stop", 0, 0);
+                        tmpstr = createpluginpath("/callmonitor1/fritzbox_msg_new.sh", 0);
+                        tmpstr = ostrcat(tmpstr, " stop", 1, 0);
                         system(tmpstr);
                         free(tmpstr); tmpstr = NULL;
@@ -200 +203 @@
                         if(hblue == 1 && ostrcmp(getlist(myconfig, "usePhoneBook", NULL), "1")  == 0)
                         {
-                                tmpstr = ostrcat(getconfig("pluginpath", NULL), "/callmonitor1/fritzbox_msg_new.sh loadPhoneBook", 0, 0);
+                                tmpstr = createpluginpath("/callmonitor1/fritzbox_msg_new.sh", 0);
+                                tmpstr = ostrcat(tmpstr, " loadPhoneBook", 1, 0);
                                 system(tmpstr);
                                 free(tmpstr); tmpstr = NULL;

titan/plugins/callmonitor1/callmonitor1.c

@@ -21 +21 @@
         coldstart = 1;
         
-        tmpstr = ostrcat(getconfig("pluginpath", NULL), "/callmonitor1/skin.xml", 0, 0);
+        tmpstr = createpluginpath("/callmonitor1/skin.xml", 0);
         readscreen(tmpstr, 121, 1);
         free(tmpstr); tmpstr = NULL;
@@ -36 +36 @@
         char* tmpstr = NULL;
 
-        tmpstr = ostrcat(getconfig("pluginpath", NULL), "/callmonitor1/fritzbox_msg_new.sh stop", 0, 0);
+        tmpstr = createpluginpath("/callmonitor1/fritzbox_msg_new.sh", 0);
+        tmpstr = ostrcat(tmpstr, " stop", 1, 0);
         system(tmpstr);
         pluginaktiv = 0;