Enlightenment CVS committal

Author  : atmosphere
Project : e17
Module  : apps/entice

Dir     : e17/apps/entice/src/bin


Modified Files:
        entice.c signals_thumb.c 


Log Message:
Hush warnings

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/entice.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- entice.c    9 Nov 2003 23:19:00 -0000       1.20
+++ entice.c    10 Nov 2003 18:15:00 -0000      1.21
@@ -55,7 +55,8 @@
       "EnticeImageScrollStop", "EnticeImageModified",
       "EnticeImageSave", "EnticeQuit", NULL
    };
-   edje_callbacks funcs[] = { _entice_delete_current, _entice_remove_current,
+   void (*funcs[])(void *data, Evas_Object *o, const char *emission,
+   const char *source) = { _entice_delete_current, _entice_remove_current,
       _entice_image_next, _entice_image_prev,
       _entice_zoom_in, _entice_zoom_out,
       _entice_zoom_in_focused, _entice_zoom_out_focused,
@@ -72,7 +73,7 @@
    };
    count = sizeof(signals) / sizeof(char *);
    for (i = 0; i < count; i++)
-      edje_object_signal_callback_add(o, signals[i], "", funcs[i].func, NULL);
+      edje_object_signal_callback_add(o, signals[i], "", funcs[i], NULL);
 
    edje_object_signal_callback_add(o, "drag,stop", "EnticeImage",
                                    _entice_image_drag_stop, NULL);
@@ -320,6 +321,21 @@
    return (result);
 }
 
+int
+entice_file_is_dir(char *file)
+{
+   struct stat st;
+
+   if (file)
+   {
+      if (stat(file, &st) < 0)
+         return (0);
+      if (S_ISDIR(st.st_mode))
+         return (1);
+   }
+   return (0);
+}
+
 void
 entice_file_add_dir_job_cb(void *data)
 {
@@ -346,21 +362,6 @@
       }
    }
 
-}
-
-int
-entice_file_is_dir(char *file)
-{
-   struct stat st;
-
-   if (file)
-   {
-      if (stat(file, &st) < 0)
-         return (0);
-      if (S_ISDIR(st.st_mode))
-         return (1);
-   }
-   return (0);
 }
 
 /**
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/signals_thumb.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- signals_thumb.c     5 Nov 2003 07:33:56 -0000       1.3
+++ signals_thumb.c     10 Nov 2003 18:15:00 -0000      1.4
@@ -126,18 +126,13 @@
 {
    int i, count;
    E_Thumb *thumb = NULL;
-   typedef struct
-   {
-      void (*func) (void *data, Evas_Object * o, const char *emission,
-                    const char *source);
-   } edje_callbacks;
    char *signals[] = { "EnticeThumbPreview", "EnticeThumbLoad" };
-   edje_callbacks funcs[] = { _entice_thumb_preview_cb,
-      _entice_thumb_load_cb
-   };
+   void (*funcs[])(void *data, Evas_Object *obj, const char *emission,
+   const char *source) = { _entice_thumb_preview_cb,
+   _entice_thumb_load_cb };
    count = sizeof(signals) / sizeof(char *);
    for (i = 0; i < count; i++)
-      edje_object_signal_callback_add(o, signals[i], "", funcs[i].func, im);
+      edje_object_signal_callback_add(o, signals[i], "", funcs[i], im);
 
    /* 
     *  this is weird, but we intercept callbacks and feed them to edje, for




-------------------------------------------------------
This SF.Net email sponsored by: ApacheCon 2003,
16-19 November in Las Vegas. Learn firsthand the latest
developments in Apache, PHP, Perl, XML, Java, MySQL,
WebDAV, and more! http://www.apachecon.com/
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to