[giFTcurs-commits] giFTcurs/src parse.c parse.h ui_draw.c ui_draw....

[Christian Häggström]

CVSROOT:        /cvsroot/giftcurs
Module name:    giFTcurs
Branch:         
Changes by:     Christian Häggström <address@hidden>    03/08/31 14:45:43

Modified files:
        src            : parse.c parse.h ui_draw.c ui_draw.h wakeup.c 

Log message:
        Make giFTwakeup compile again by moving vstrlen()

Patches:
Index: giFTcurs/src/parse.c
diff -u giFTcurs/src/parse.c:1.145 giFTcurs/src/parse.c:1.146
--- giFTcurs/src/parse.c:1.145  Sat Aug 23 16:01:44 2003
+++ giFTcurs/src/parse.c        Sun Aug 31 14:45:42 2003
@@ -18,7 +18,7 @@
  * along with giFTcurs; if not, write to the Free Software Foundation,
  * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307,  USA.
  *
- * $Id: parse.c,v 1.145 2003/08/23 20:01:44 weinholt Exp $
+ * $Id: parse.c,v 1.146 2003/08/31 18:45:42 saturn Exp $
  */
 #include "giftcurs.h"
 
@@ -315,13 +315,4 @@
                        return (i << 3) + g_bit_nth_lsf(~bitmap[i], -1);
 
        return -1;
-}
-
-/* Visual strlen() */
-glong vstrlen(const char *str)
-{
-       if (!utf8)
-               return strlen(str);
-       else
-               return g_utf8_strlen(str, -1);
 }
Index: giFTcurs/src/parse.h
diff -u giFTcurs/src/parse.h:1.89 giFTcurs/src/parse.h:1.90
--- giFTcurs/src/parse.h:1.89   Sat Aug 23 16:01:44 2003
+++ giFTcurs/src/parse.h        Sun Aug 31 14:45:42 2003
@@ -18,7 +18,7 @@
  * along with giFTcurs; if not, write to the Free Software Foundation,
  * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307,  USA.
  *
- * $Id: parse.h,v 1.89 2003/08/23 20:01:44 weinholt Exp $
+ * $Id: parse.h,v 1.90 2003/08/31 18:45:42 saturn Exp $
  */
 #ifndef _PARSE_H
 #define _PARSE_H
@@ -82,8 +82,5 @@
 void bitmap_set(guchar *bitmap, guint size, guint idx, gboolean value);
 gboolean bitmap_get(guchar *bitmap, guint size, guint idx);
 gint bitmap_find_unset(guchar *bitmap, guint size);
-
-/* Visual strlen(). Returns how many chars will be viewed on the screen. */
-glong vstrlen(const char *str);
 
 #endif
Index: giFTcurs/src/ui_draw.c
diff -u giFTcurs/src/ui_draw.c:1.105 giFTcurs/src/ui_draw.c:1.106
--- giFTcurs/src/ui_draw.c:1.105        Sat Aug 23 16:01:44 2003
+++ giFTcurs/src/ui_draw.c      Sun Aug 31 14:45:42 2003
@@ -18,7 +18,7 @@
  * along with giFTcurs; if not, write to the Free Software Foundation,
  * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307,  USA.
  *
- * $Id: ui_draw.c,v 1.105 2003/08/23 20:01:44 weinholt Exp $
+ * $Id: ui_draw.c,v 1.106 2003/08/31 18:45:42 saturn Exp $
  */
 #include "giftcurs.h"
 
@@ -285,4 +285,13 @@
 void clrscr(void)
 {
        erase();
+}
+
+/* Visual strlen() */
+glong vstrlen(const char *str)
+{
+       if (!utf8)
+               return strlen(str);
+       else
+               return g_utf8_strlen(str, -1);
 }
Index: giFTcurs/src/ui_draw.h
diff -u giFTcurs/src/ui_draw.h:1.40 giFTcurs/src/ui_draw.h:1.41
--- giFTcurs/src/ui_draw.h:1.40 Tue Jul 22 20:26:25 2003
+++ giFTcurs/src/ui_draw.h      Sun Aug 31 14:45:42 2003
@@ -18,7 +18,7 @@
  * along with giFTcurs; if not, write to the Free Software Foundation,
  * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307,  USA.
  *
- * $Id: ui_draw.h,v 1.40 2003/07/23 00:26:25 weinholt Exp $
+ * $Id: ui_draw.h,v 1.41 2003/08/31 18:45:42 saturn Exp $
  */
 #ifndef _UI_DRAW_H
 #define _UI_DRAW_H
@@ -50,5 +50,8 @@
 void draw_fmt_str(int x, int y, int w, int selected, const char *str);
 
 void draw_printfmt(int w, const char *fmt, ...);
+
+/* Visual strlen(). Returns how many chars will be viewed on the screen. */
+glong vstrlen(const char *str);
 
 #endif
Index: giFTcurs/src/wakeup.c
diff -u giFTcurs/src/wakeup.c:1.22 giFTcurs/src/wakeup.c:1.23
--- giFTcurs/src/wakeup.c:1.22  Tue Jul 22 19:58:37 2003
+++ giFTcurs/src/wakeup.c       Sun Aug 31 14:45:42 2003
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307,  USA.
  *
- * $Id: wakeup.c,v 1.22 2003/07/22 23:58:37 weinholt Exp $
+ * $Id: wakeup.c,v 1.23 2003/08/31 18:45:42 saturn Exp $
  */
 
 /* This small app is meant to run in background and tries to
@@ -67,7 +67,7 @@
 static gboolean gift_handle_read(GIOChannel * source, GIOCondition condition, 
gpointer data);
 static int gift_write(ntree *packet);
 
-void download_incoming_source_handler(ntree *data)
+static void download_incoming_source_handler(ntree *data)
 {
        const char *href, *user, *hash;
        unsigned int filesize;
@@ -130,7 +130,7 @@
 
 static gboolean periodic_check(void *udata);
 
-int init(int argc, char *argv[])
+static int init(int argc, char *argv[])
 {
        ntree *packet = NULL;
        int intrvl = 300;
@@ -369,10 +369,4 @@
        }
        g_message("...done");
        return TRUE;
-}
-
-/* dummy function to make list.o link */
-char *get_config(char *item, char *def)
-{
-       return def;
 }