[Ayttm-commits] CVS: ayttm/modules/utility middle.c,1.5,1.6 notes.c,1.5,1.6 rainbow.c,1.6,1.7

[Philip S Tellis <address@hidden>]

Update of /cvsroot/ayttm/ayttm/modules/utility
In directory subversions:/tmp/cvs-serv29685/modules/utility

Modified Files:
        middle.c notes.c rainbow.c 
Log Message:
glib stuff

Index: middle.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/modules/utility/middle.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- middle.c    24 Jan 2003 15:46:12 -0000      1.5
+++ middle.c    27 Jan 2003 13:48:19 -0000      1.6
@@ -24,6 +24,8 @@
 #endif
 
 #include "intl.h"
+#include <stdlib.h>
+#include <string.h>
 
 #include "externs.h"
 #include "plugin_api.h"
@@ -38,7 +40,7 @@
 #define plugin_finish middle_LTX_plugin_finish
 
 /* Function Prototypes */
-static gchar * plstripHTML(eb_local_account * local, eb_account * remote, 
struct contact * contact, gchar * s);
+static char * plstripHTML(eb_local_account * local, eb_account * remote, 
struct contact * contact, char * s);
 static int middle_init();
 static int middle_finish();
 
@@ -62,12 +64,12 @@
 
 static int middle_init()
 {
-  input_list * il=g_new0(input_list, 1);
+  input_list * il=calloc(1, sizeof(input_list));
   plugin_info.prefs=il;
 
   il->widget.checkbox.value = &doLeet;
   il->widget.checkbox.name = "doLeet";
-  il->widget.entry.label = g_strdup(_("Enable L33t-speak conversion"));
+  il->widget.entry.label = strdup(_("Enable L33t-speak conversion"));
   il->type=EB_INPUT_CHECKBOX;
 
   eb_debug(DBG_MOD, "L33tSp33k initialised\n");
@@ -90,7 +92,7 @@
 
/*******************************************************************************
  *                             End Module Code
  
******************************************************************************/
-static gchar * plstripHTML(eb_local_account * local, eb_account * remote, 
struct contact * contact, gchar * s)
+static char * plstripHTML(eb_local_account * local, eb_account * remote, 
struct contact * contact, char * s)
 {
   int pos=0;
 

Index: notes.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/modules/utility/notes.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- notes.c     24 Jan 2003 15:46:12 -0000      1.5
+++ notes.c     27 Jan 2003 13:48:19 -0000      1.6
@@ -23,6 +23,7 @@
 
 #include <stdlib.h>
 #include <sys/stat.h>
+#include <string.h>
 #include <unistd.h>
 
 #ifdef __MINGW32__
@@ -80,7 +81,7 @@
 
 static int plugin_init()
 {
-       input_list * il = g_new0(input_list, 1);
+       input_list * il = calloc(1, sizeof(input_list));
        int result=0;
 
        eb_debug(DBG_MOD, "notes init\n");
@@ -154,12 +155,12 @@
                char *args[3];
                int e;
 
-               args[0] = g_strdup(plugin_info.prefs->widget.entry.value);
-               args[1] = g_strdup(cmd_buff);
+               args[0] = strdup(plugin_info.prefs->widget.entry.value);
+               args[1] = strdup(cmd_buff);
                args[2] = NULL;
                e = execvp(args[0], args);
-               g_free(args[0]);
-               g_free(args[1]);
+               free(args[0]);
+               free(args[1]);
                _exit(0);
        }
 #endif

Index: rainbow.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/modules/utility/rainbow.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rainbow.c   24 Jan 2003 15:46:12 -0000      1.6
+++ rainbow.c   27 Jan 2003 13:48:19 -0000      1.7
@@ -42,7 +42,7 @@
 
 /* Function Prototypes */
 /* ebmCallbackData is a parent struct, the child of which will be an 
ebmContactData */
-static gchar * dorainbow(eb_local_account * local, eb_account * remote, struct 
contact * contact, gchar * s);
+static char * dorainbow(eb_local_account * local, eb_account * remote, struct 
contact * contact, char * s);
 static int rainbow_init();
 static int rainbow_finish();
 
@@ -77,50 +77,50 @@
 
 static int rainbow_init()
 {
-  input_list * il=g_new0(input_list, 1);
+  input_list * il=calloc(1, sizeof(input_list));
   plugin_info.prefs=il;
 
   il->widget.checkbox.value = &doRainbow;
   il->widget.checkbox.name = "doRainbow";
-  il->widget.checkbox.label = g_strdup(_("Enable rainbow conversion"));
+  il->widget.checkbox.label = strdup(_("Enable rainbow conversion"));
   il->type=EB_INPUT_CHECKBOX;
 
-  il->next=g_new0(input_list, 1);
+  il->next=calloc(1, sizeof(input_list));
   il=il->next;
   il->widget.entry.value = sstart_r;
   il->widget.entry.name = "sstart_r";
-  il->widget.entry.label = g_strdup(_("Starting R value"));
+  il->widget.entry.label = strdup(_("Starting R value"));
   il->type=EB_INPUT_ENTRY;
-  il->next=g_new0(input_list, 1);
+  il->next=calloc(1, sizeof(input_list));
   il=il->next;
   il->widget.entry.value = sstart_g;
   il->widget.entry.name = "sstart_g";
-  il->widget.entry.label = g_strdup(_("Starting G value"));
+  il->widget.entry.label = strdup(_("Starting G value"));
   il->type=EB_INPUT_ENTRY;
-  il->next=g_new0(input_list, 1);
+  il->next=calloc(1, sizeof(input_list));
   il=il->next;
   il->widget.entry.value = sstart_b;
   il->widget.entry.name = "sstart_b";
-  il->widget.entry.label = g_strdup(_("Starting B value"));
+  il->widget.entry.label = strdup(_("Starting B value"));
   il->type=EB_INPUT_ENTRY;
 
-  il->next=g_new0(input_list, 1);
+  il->next=calloc(1, sizeof(input_list));
   il=il->next;
   il->widget.entry.value = send_r;
   il->widget.entry.name = "send_r";
-  il->widget.entry.label = g_strdup(_("Ending R value"));
+  il->widget.entry.label = strdup(_("Ending R value"));
   il->type=EB_INPUT_ENTRY;
-  il->next=g_new0(input_list, 1);
+  il->next=calloc(1, sizeof(input_list));
   il=il->next;
   il->widget.entry.value = send_g;
   il->widget.entry.name = "send_g";
-  il->widget.entry.label = g_strdup(_("Ending G value"));
+  il->widget.entry.label = strdup(_("Ending G value"));
   il->type=EB_INPUT_ENTRY;
-  il->next=g_new0(input_list, 1);
+  il->next=calloc(1, sizeof(input_list));
   il=il->next;
   il->widget.entry.value = send_b;
   il->widget.entry.name = "send_b";
-  il->widget.entry.label = g_strdup(_("Ending B value"));
+  il->widget.entry.label = strdup(_("Ending B value"));
   il->type=EB_INPUT_ENTRY;
 
   eb_debug(DBG_MOD, "Rainbow initialised\n");
@@ -141,10 +141,10 @@
 
/*******************************************************************************
  *                             End Module Code
  
******************************************************************************/
-static gchar * dorainbow(eb_local_account * local, eb_account * remote, struct 
contact * contact, gchar * s)
+static char * dorainbow(eb_local_account * local, eb_account * remote, struct 
contact * contact, char * s)
 {
-  gchar * retval;
-  gchar * wptr;
+  char * retval;
+  char * wptr;
   int pos=0;
   int start_r=atoi(sstart_r);
   int start_g=atoi(sstart_g);
@@ -163,7 +163,7 @@
   if(end_g>255 || end_g<0) { end_g=0; }
   if(end_b>255 || end_b<0) { end_b=0; }
 
-  wptr=retval=malloc(23*len*sizeof(gchar));
+  wptr=retval=malloc(23*len*sizeof(char));
 
   while(s[pos]!='\0')
   {