Enlightenment CVS committal

Author  : atmosphere
Project : e17
Module  : apps/iconbar

Dir     : e17/apps/iconbar/src


Modified Files:
        iconbar.c main.c prefs.c prefs.h util.c 


Log Message:
o Use the preferences system, new additions include
 - shaped window is configurable(defaults on)
 - borderless window is configurable(defaults on)
 - NEW: raise_lower window on mouse in/out (defaults off)
 - generate a sane default db first time you run it
 - Reordering hasn't been tested well(might segv)
o main.c
 - Got rid of globals, use evas_object_name_set instead
 - add ecore_evas raise/lower callbacks
 - add an exit handler for ecore
 - ensure ecore initializes ok
o iconbar.c
 - remove functions we're not using anymore
 - hush errors if the theme's missing a container_layout
 - add iconbar's path/fonts as a font dir 
 - order/writing of the icons supplied by config system
o Lots of compiler warnings hushed


===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/iconbar/src/iconbar.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- iconbar.c   17 Jan 2004 02:53:05 -0000      1.10
+++ iconbar.c   17 Jan 2004 19:38:07 -0000      1.11
@@ -2,6 +2,8 @@
 #include "util.h"
 #include <math.h>
 #include <time.h>
+#include "prefs.h"
+
 /* smart object handlers */
 void iconbar_add(Evas_Object *o);
 void iconbar_del(Evas_Object *o);
@@ -29,14 +31,9 @@
 static void cb_icon(void *data, Evas_Object *o, const char *sig, const char *src);
 static void cb_exec(void *data, Evas_Object *o, const char *sig, const char *src);
 
-static void mouse_down(void *data, Evas *e, Evas_Object *o, void *event_info);
-static void mouse_up(void *data, Evas *e, Evas_Object *o, void *event_info);
-static void mouse_move(void *data, Evas *e, Evas_Object *o, void *event_info);
-
-
 
 /* keep this global, so it only has to be created once */
-Evas_Smart *smart;
+static Evas_Smart *smart = NULL;
 
 
 Evas_Object *
@@ -63,8 +60,9 @@
 void
 iconbar_path_set(Evas_Object *obj, char *path)
 {
-  Iconbar *ib = evas_object_smart_data_get(obj);
   char buf[2048];
+  const char *layout = NULL;
+  Iconbar *ib = evas_object_smart_data_get(obj);
 
   if(ib->path) free(ib->path);
   ib->path = (char *)strdup(path);
@@ -82,15 +80,15 @@
   }
   else
   {
-    printf("no bits!\n");
+    printf("Bad Edje File Supplied!\n");
     return;
   }
 
   evas_object_move(ib->cont, 10, 10);
   evas_object_resize(ib->cont, 20, 200);
   evas_object_show(ib->cont);
-  e_container_layout_plugin_set(ib->cont, 
-                   edje_file_data_get(buf, "container_layout"));
+  if((layout = edje_file_data_get(buf, "container_layout")))
+    e_container_layout_plugin_set(ib->cont, layout);
   edje_object_part_swallow(ib->gui, "icons", ib->cont); //was clip
   e_container_callback_order_change_set(ib->cont, write_out_order, ib);
 
@@ -99,7 +97,7 @@
   edje_object_signal_callback_add(ib->gui, "exec*", "*", cb_exec, ib);
 
 
-  snprintf(buf, PATH_MAX, "%s/", path);
+  snprintf(buf, PATH_MAX, "%s/fonts", path);
   evas_font_path_append(evas_object_evas_get(obj), buf);
   iconbar_icons_load(ib);
   evas_object_layer_set(ib->cont, 100);
@@ -323,71 +321,11 @@
   evas_object_clip_unset(ib->gui);
 }
 
-/**************** helpers *************/
-
-static int
-positive_scroll_timer(void *data)
-{
-  Iconbar *ib;
-  double l, r, t, b;
- 
-  ib = (Iconbar *)data;
-
-  if (!ib->scroll_timer)
-      return(0);
-    
-  ib->scroll += 8;
-
-  if (e_container_direction_get(ib->cont))
-  {
-    e_container_padding_get(ib->cont, &l, &r, &t, &b);
-    e_container_padding_set(ib->cont, l, r, ib->scroll, b);
-  }
-  else
-  {
-    e_container_padding_get(ib->cont, &l, &r, &t, &b);
-    e_container_padding_set(ib->cont, ib->scroll, r, t, b);
-  }
-//  iconbar_icons_fix(ib);
-  return(1);
-}
-
-static int
-negative_scroll_timer(void *data)
-{
-  Iconbar *ib;
-  double l, r, t, b;
- 
-  ib = (Iconbar *)data;
- 
-  if (!ib->scroll_timer)
-      return(0);
-    
-  ib->scroll -= 8;
-
-  if (e_container_direction_get(ib->cont))
-  {
-    e_container_padding_get(ib->cont, &l, &r, &t, &b);
-    e_container_padding_set(ib->cont, l, r, ib->scroll, b);
-  }
-  else
-  {
-    e_container_padding_get(ib->cont, &l, &r, &t, &b);
-    e_container_padding_set(ib->cont, ib->scroll, r, t, b);
-  }
-
-
-//  iconbar_icons_fix(ib);
-
-  return(1);
-}
-
 Icon *
 iconbar_icon_new(Iconbar *ib, char *path)
 {
   Evas *evas;
   Icon *ic;
-  double w, h;
 
   evas = evas_object_evas_get(ib->obj);
   ic = (Icon *)malloc(sizeof(Icon));
@@ -439,42 +377,29 @@
 
   /* add them to the container as specified in order.txt */
   {
-    FILE *f;
+    Evas_List *l, *ll;
     char buf[PATH_MAX];
-    double count;
-    Evas_List *l;
-    int i = 0;
-
-    snprintf(buf, sizeof(buf), "%s/order.txt", ib->path);
     
-    count = 0;
-    f = fopen(buf, "r");
-
-    if (f)
+    for(ll = iconbar_config_icons_get(); ll; ll = ll->next)
     {
-
-      while (fgets(buf, sizeof(buf) - 1, f))
-      {
-        buf[strlen(buf) - 1] = 0;
-
         for (l = icons; l; l = evas_list_next(l))
         {
           Icon *ic;
           char *p;
-
+           
+         snprintf(buf, PATH_MAX, "%s", (char*)ll->data);
           ic = evas_list_data(l);
-          p = strrchr(ic->file, '/');
-          if (p)
+          if (!strcmp(ic->file, (char*)ll->data))
           {
+            new = evas_list_append(new, ic);
+          }
+         else if((p = strrchr(ic->file, '/')))
+         {
             p++;
-            if (!strcmp(p, buf))
-            {
-              new = evas_list_append(new, ic);
-            }
+           if (!strcmp(p, buf))
+               new = evas_list_append(new, ic);
           }
-        }
-      }
-      fclose(f);
+       }
     }
 
 
@@ -506,17 +431,11 @@
 void
 write_out_order(void *data)
 {
-  FILE *f;
-  char buf[PATH_MAX];
-  Evas_List *l, *ll;
   Iconbar *ib = NULL;
+  Evas_List *l = NULL, *ll = NULL;
     
   if((ib = (Iconbar*)data))
   {
-    snprintf(buf, sizeof(buf), "%s/order.txt", ib->path);
-    if ((f = fopen(buf, "w")))
-    {
-       printf("file opened ok\n");
        for (l = e_container_elements_get(ib->cont); l; l = l->next)
        {
            Evas_Object *obj = l->data;
@@ -527,13 +446,10 @@
            if (p)
            {
                p++;
-               fputs(p, f);
-               fputs("\n", f);
-               printf("write: %s\n", p);
+               ll = evas_list_append(ll, strdup(p));
            }
        }
-       fclose(f);
-    }
+       iconbar_config_icons_set(ll);
   }
 }
 
@@ -605,7 +521,6 @@
 {
     char buf[PATH_MAX];
     Iconbar *ib = NULL; 
-    Evas_Object *o = NULL;
     struct tm *_tm = NULL;
     time_t _time = time(NULL);
 
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/iconbar/src/main.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- main.c      17 Jan 2004 01:34:05 -0000      1.8
+++ main.c      17 Jan 2004 19:38:07 -0000      1.9
@@ -7,29 +7,25 @@
 #include "iconbar.h"
 #include "util.h"
 #include "config.h"
+#include "prefs.h"
 
-static void resize(Ecore_Evas *ee);
+static void window_resize(Ecore_Evas *ee);
 static void window_leave(Ecore_Evas *ee);
-static int cb_exit(Ecore_Evas *ee);
-
-void write_out_geometry(Ecore_Evas *ee);
-void set_default_geom(Ecore_Evas *ee);
-
-Ecore_Evas *ee;
-Evas_Object *bg;
-Evas_Object *iconbar;
-
-int default_geom_set = 0;
-int trans_bg = 0;
-int shaped = 1;
+static void window_enter(Ecore_Evas *ee);
+static void window_delete(Ecore_Evas *ee);
+static int cb_exit(void *data, int type, void *event);
 
 int
 main(int argc, char **argv)
 {
+  int x, y, w, h;
   char buf[2048];
+  Evas_List *l = NULL;
   int i, withdrawn = 0;
+  Evas_Object *o = NULL;
+  Ecore_Evas *ee = NULL;
   Evas_Coord edjew, edjeh;
-  Evas_Object *edje = NULL;
+  Evas_Object *iconbar = NULL;
 
   for (i = 1; i < argc; i++)
   {
@@ -38,55 +34,67 @@
   }
   printf("withdrawn: %d\n", withdrawn);
   
-  ecore_init();
-  ecore_app_args_set(argc, argv);
+  if(!ecore_init())
+  {
+    fprintf(stderr, "Unable to init Ecore, bailing out.\n");
+    return(-1);
+  }
+  ecore_app_args_set(argc, (const char**)argv);
+
+  ecore_event_handler_add(ECORE_EVENT_SIGNAL_EXIT, cb_exit, ee);
+
   ecore_evas_init();
   edje_init();
+  
+  iconbar_config_init();
+  iconbar_config_geometry_get(&x, &y, &w, &h);
 
-  ee = ecore_evas_software_x11_new(NULL, 0, 0, 0, 50, 100);
+  ee = ecore_evas_software_x11_new(NULL, 0, x, y, w, h);
+  ecore_evas_callback_mouse_in_set(ee, window_enter);
   ecore_evas_callback_mouse_out_set(ee, window_leave);
-  ecore_evas_callback_resize_set(ee, resize);
-  ecore_evas_callback_move_set(ee, resize);
-
-
-
-  ecore_evas_callback_delete_request_set(ee, cb_exit);
-  ecore_evas_callback_destroy_set(ee, cb_exit);
+  ecore_evas_callback_resize_set(ee, window_resize);
+  ecore_evas_callback_move_set(ee, window_resize);
+  ecore_evas_callback_delete_request_set(ee, window_delete);
+  ecore_evas_callback_destroy_set(ee, window_delete);
   ecore_evas_name_class_set(ee, "Iconbar", "Rephorm");
   ecore_evas_title_set(ee, "Iconbar");
   ecore_evas_borderless_set(ee, 1);
   ecore_evas_shaped_set(ee, 1);
-
-  evas_font_path_append(ecore_evas_get(ee), PACKAGE_DATA_DIR);
-
+  
 #ifdef HAVE_TRANS_BG
   {
-    int x, y, w, h;
     ecore_evas_geometry_get(ee, &x, &y, &w, &h);
-    bg = esmart_trans_x11_new(ecore_evas_get(ee));
-    evas_object_layer_set(bg, 0);
-    evas_object_move(bg, 0, 0);
-    evas_object_resize(bg, w, h);
-    evas_object_name_set(bg, "trans");
+    o = esmart_trans_x11_new(ecore_evas_get(ee));
+    evas_object_layer_set(o, 0);
+    evas_object_move(o, 0, 0);
+    evas_object_resize(o, w, h);
+    evas_object_name_set(o, "trans");
     
-    esmart_trans_x11_freshen(bg, x, y, w, h);
-    evas_object_show(bg);
+    esmart_trans_x11_freshen(o, x, y, w, h);
+    evas_object_show(o);
   }
 #endif
 
-  sprintf(buf, "%s/.e/iconbar", get_user_home());
+  for(l = iconbar_config_font_path_get(); l; l = l->next)
+  {
+    evas_font_path_append(ecore_evas_get(ee), (void*)l->data);
+    free(l->data);
+    l->data = NULL;
+  }
+  evas_font_path_append(ecore_evas_get(ee), PACKAGE_DATA_DIR);
 
   iconbar = iconbar_new(ecore_evas_get(ee));
+  snprintf(buf, PATH_MAX, "%s/.e/iconbar/", getenv("HOME"));
   if (e_file_exists(buf))
   {
     iconbar_path_set(iconbar, buf);
-    if((edje = iconbar_gui_get(iconbar)))
+    if((o = iconbar_gui_get(iconbar)))
     {
-       edje_object_size_min_get(edje, &edjew, &edjeh);
+       edje_object_size_min_get(o, &edjew, &edjeh);
        if((edjew > 0) && (edjeh > 0))
            ecore_evas_size_min_set(ee, (int)edjew, (int)edjeh);
        
-       edje_object_size_max_get(edje, &edjew, &edjeh);
+       edje_object_size_max_get(o, &edjew, &edjeh);
        if((edjew > 0) && (edjeh > 0))
            ecore_evas_size_max_set(ee, (int)edjew, (int)edjeh);
     }
@@ -99,30 +107,33 @@
   }
 
   evas_object_move(iconbar, 0, 0);
-  evas_object_resize(iconbar, 65, 200);
+  evas_object_resize(iconbar, w, h);
   evas_object_layer_set(iconbar, 10);
+  evas_object_name_set(iconbar, "iconbar");
   evas_object_show(iconbar);
 
   ecore_evas_show(ee);
-  set_default_geom(ee);
-
 
   ecore_main_loop_begin();
-
+  
+  iconbar_config_free();
   edje_shutdown();
   ecore_evas_shutdown();
   ecore_shutdown();
 
   return 0;
 }
-
+/*==========================================================================
+ * Callbacks from here on down 
+ *========================================================================*/
 static void
-resize(Ecore_Evas *ee)
+window_resize(Ecore_Evas *ee)
 {
   int x, y, w, h;
   Evas_Object *o = NULL;
+  
   ecore_evas_geometry_get(ee, &x, &y, &w, &h);
-
+  iconbar_config_geometry_set(x, y, w, h);
 #ifdef HAVE_TRANS_BG
   if((o = evas_object_name_find(ecore_evas_get(ee), "trans")))
   {
@@ -130,89 +141,32 @@
     esmart_trans_x11_freshen(o, x, y, w, h);
   }
 #endif
-  evas_object_resize(iconbar, w, h); 
+  if((o = evas_object_name_find(ecore_evas_get(ee), "iconbar")))
+  {
+    evas_object_resize(o, w, h);
+  }
 }
-
 static void
 window_leave(Ecore_Evas *ee)
 {
-  Evas_List *l;
-  Iconbar *ib = evas_object_smart_data_get(iconbar);
-
+  if(iconbar_config_raise_lower_get())
+    ecore_evas_lower(ee);
   /* FIXME: run through the icons and stop them from pulsing */
 }
-
-void
-write_out_geometry(Ecore_Evas *ee)
+static void
+window_enter(Ecore_Evas *ee)
 {
-  FILE *f;
-  char buf[PATH_MAX];
-  
-  snprintf(buf, sizeof(buf), "%s/geometry.txt", iconbar_path_get(iconbar));
-  
-  f = fopen(buf, "w");
-  
-  if (f)
-  {
-    char buf[100];
-    int x, y, w, h;
-
-//    printf("writing...\n");
-
-    ecore_evas_geometry_get(ee, &x, &y, &w, &h);
-
-    sprintf(buf, "%d\n", x);
-    fputs(buf, f);
-    sprintf(buf, "%d\n", y);
-    fputs(buf, f);
-    sprintf(buf, "%d\n", w);
-    fputs(buf, f);
-    sprintf(buf, "%d\n", h);
-    fputs(buf, f);
-    fclose(f);
-  }
+  if(iconbar_config_raise_lower_get())
+    ecore_evas_raise(ee);
 }
-
-
-void
-set_default_geom(Ecore_Evas *ee)
+static void
+window_delete(Ecore_Evas *ee)
 {
-  FILE *f;
-  char buf[PATH_MAX];
-  int x = 0, y = 0, w = 66, h = 400;
-  
-//  printf("setting default geom\n");  
-  snprintf(buf, sizeof(buf), "%s/geometry.txt", iconbar_path_get(iconbar));
-  
-  f = fopen(buf, "r");
-  
-  if (f)
-  {
-    if(fgets(buf, sizeof(buf) - 1, f))
-       x = atoi(buf);
-    if(fgets(buf, sizeof(buf) - 1, f))
-       y = atoi(buf);
-    if(fgets(buf, sizeof(buf) - 1, f))
-       w = atoi(buf);
-    if(fgets(buf, sizeof(buf) - 1, f))
-       h = atoi(buf);
-
-//    printf("(%d, %d) %d x %d\n", x, y, w, h);
-    fclose(f);
-  }
-  else 
-  {
-    printf("no geometry file. starting at default size. \n");
-  }
-  ecore_evas_move(ee, x, y);
-  ecore_evas_resize(ee, w, h);
-  default_geom_set = 1;
+    ecore_main_loop_quit();
 }
-
 static int
-cb_exit(Ecore_Evas *ee)
+cb_exit(void *data, int type, void *event)
 {
-  write_out_geometry(ee);
   ecore_main_loop_quit();
   return 0;
 }
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/iconbar/src/prefs.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- prefs.c     17 Jan 2004 17:30:10 -0000      1.1
+++ prefs.c     17 Jan 2004 19:38:07 -0000      1.2
@@ -17,6 +17,8 @@
     int x, y, w, h;
     int shaped;
     int transparent;
+    int raise;
+    int borderless;
 };
 typedef struct _Iconbar_Prefs Iconbar_Prefs;
 
@@ -52,16 +54,20 @@
                if(ibprefs->home) free(ibprefs->home);
                ibprefs->home = str;
            }
-           if((str = e_db_str_get(db, "/iconbar/theme")))
-           {
-               if(ibprefs->theme) free(ibprefs->theme);
-               ibprefs->theme = str;
-           }
+           str = e_db_str_get(db, "/iconbar/theme");
+           iconbar_config_theme_set(str);
+           if(str) free(str);
            if((str = e_db_str_get(db, "/iconbar/time_format")))
            {
                if(ibprefs->time_format) free(ibprefs->time_format);
                ibprefs->time_format = str;
            }
+           if(!e_db_int_get(db, "/iconbar/raise", &ibprefs->raise))
+               ibprefs->raise = 0;
+           if(!e_db_int_get(db, "/iconbar/shaped", &ibprefs->shaped))
+               ibprefs->shaped = 1;
+           if(!e_db_int_get(db, "/iconbar/borderless", &ibprefs->shaped))
+               ibprefs->borderless = 1;
            if(!e_db_int_get(db, "/iconbar/x", &ibprefs->x))
                ibprefs->x = 0;
            if(!e_db_int_get(db, "/iconbar/y", &ibprefs->y))
@@ -95,8 +101,7 @@
 void
 iconbar_config_free(void)
 {
-    char *str;
-    int i = 0,count = 0;
+    int i = 0;
     char buf[PATH_MAX];
     Evas_List *l = NULL;
     E_DB_File *db = NULL;
@@ -108,6 +113,9 @@
            e_db_str_set(db, "/iconbar/home", ibprefs->home);
            e_db_str_set(db, "/iconbar/theme", ibprefs->theme);
            e_db_str_set(db, "/iconbar/time_format", ibprefs->time_format);
+           e_db_int_set(db, "/iconbar/raise", ibprefs->raise);
+           e_db_int_set(db, "/iconbar/shaped", ibprefs->shaped);
+           e_db_int_set(db, "/iconbar/borderless", ibprefs->borderless);
            e_db_int_set(db, "/iconbar/x", ibprefs->x);
            e_db_int_set(db, "/iconbar/y", ibprefs->y);
            e_db_int_set(db, "/iconbar/w", ibprefs->w);
@@ -122,6 +130,7 @@
            e_db_close(db);
            e_db_flush();
        }
+       _iconbar_prefs_free(ibprefs);
     }
 }
 /* modify */
@@ -172,8 +181,11 @@
     if(ibprefs)
     {
        char buf[PATH_MAX];
-       snprintf(buf, PATH_MAX, "%s", theme);
        if(ibprefs->theme) free(ibprefs->theme);
+       if(theme)
+           snprintf(buf, PATH_MAX, "%s", theme);
+       else 
+           snprintf(buf,PATH_MAX,"%s/.e/iconbar/iconbar.eet",getenv("HOME"));
        ibprefs->theme = strdup(buf);
     }
 }
@@ -194,6 +206,24 @@
        ibprefs->icons = list;
     }
 }
+void
+iconbar_config_borderless_set(int on)
+{
+    if(ibprefs)
+       ibprefs->borderless = on;
+}
+void
+iconbar_config_shaped_set(int on)
+{
+    if(ibprefs)
+       ibprefs->shaped = on;
+}
+void
+iconbar_config_raise_lower_set(int on)
+{
+    if(ibprefs)
+       ibprefs->raise = on;
+}
 /* query */
 const char*
 iconbar_config_theme_get(void)
@@ -244,6 +274,27 @@
        if(h) *h = ibprefs->h;
     }
 }
+int
+iconbar_config_raise_lower_get(void)
+{
+    if(ibprefs)
+       return(ibprefs->raise);
+    return(0);
+}
+int
+iconbar_config_shaped_get(void)
+{
+    if(ibprefs)
+       return(ibprefs->shaped);
+    return(0);
+}
+int
+iconbar_config_borderless_get(void)
+{
+    if(ibprefs)
+       return(ibprefs->borderless);
+    return(0);
+}
 /*==========================================================================
  * Private Functions 
  *========================================================================*/
@@ -279,12 +330,11 @@
 static void
 iconbar_config_generate_original_db(char *file)
 {
-    int i = 0,count = 0;
+    int i = 0;
     char buf[PATH_MAX], key[PATH_MAX], buf2[PATH_MAX];
     struct stat status;
-    char *dirs[] = { ".e", ".e/apps", ".e/apps/iconbar",
-    ".e/apps/iconbar/themes", ".e/apps/iconbar/icons",
-    ".e/apps/iconbar/fonts" };
+    char *dirs[] = { ".e", ".e/iconbar", ".e/iconbar/themes",
+       ".e/iconbar/icons", ".e/iconbar/fonts" };
     char *icons[] = { "eterm", "xmms", "evolution", "galeon", "gaim", "gimp",
     "irc", "abiword", };
     E_DB_File *db = NULL;
@@ -302,13 +352,17 @@
        e_db_str_set(db, "/iconbar/home", buf);
        e_db_str_set(db, "/iconbar/time_format", "%l:%M %p");
        snprintf(buf, PATH_MAX, "%s/iconbar.eet", PACKAGE_DATA_DIR);
-       snprintf(buf2, PATH_MAX, "%s/.e/apps/iconbar/iconbar.eet",
+       snprintf(buf2, PATH_MAX, "%s/.e/iconbar/iconbar.eet",
        getenv("HOME"));
        if(e_file_cp(buf, buf2))
            e_db_str_set(db, "/iconbar/theme", buf2);
        else
            e_db_str_set(db, "/iconbar/theme", buf);
 
+       e_db_int_set(db, "/iconbar/raise", 0);
+       e_db_int_set(db, "/iconbar/shaped", 1);
+       e_db_int_set(db, "/iconbar/borderless", 1);
+
        e_db_int_set(db, "/iconbar/x", 0);
        e_db_int_set(db, "/iconbar/y", 0);
        e_db_int_set(db, "/iconbar/w", 80);
@@ -316,7 +370,7 @@
 
        e_db_int_set(db, "/iconbar/fonts/count", 2);
        e_db_str_set(db, "/iconbar/fonts/0/path", PACKAGE_DATA_DIR);
-       snprintf(buf, PATH_MAX, "%s/.e/apps/iconbar/fonts", getenv("HOME"));
+       snprintf(buf, PATH_MAX, "%s/.e/iconbar/fonts", getenv("HOME"));
        e_db_str_set(db, "/iconbar/fonts/1/path", buf);
        
        e_db_int_set(db, "/iconbar/icons/count", 8);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/iconbar/src/prefs.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- prefs.h     17 Jan 2004 17:30:10 -0000      1.1
+++ prefs.h     17 Jan 2004 19:38:07 -0000      1.2
@@ -14,6 +14,9 @@
 void iconbar_config_geometry_set(int x, int y, int w, int h);
 void iconbar_config_icons_set(Evas_List *list);
 void iconbar_config_theme_set(const char *theme);
+void iconbar_config_raise_lower_set(int on);
+void iconbar_config_shaped_set(int on);
+void iconbar_config_borderless_set(int on);
 
 /* query */
 const char *iconbar_config_theme_get(void);
@@ -22,4 +25,8 @@
 Evas_List *iconbar_config_font_path_get(void);
 Evas_List *iconbar_config_icons_get(void);
 void iconbar_config_geometry_get(int *x, int *y, int *w, int *h);
+int iconbar_config_raise_lower_get(void);
+int iconbar_config_shaped_get(void);
+int iconbar_config_borderless_get(void);
+
 #endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/iconbar/src/util.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- util.c      27 Jul 2003 19:36:54 -0000      1.1
+++ util.c      17 Jan 2004 19:38:07 -0000      1.2
@@ -23,7 +23,6 @@
 exec_run_in_dir(char *exec, char *dir)
 {
    Ecore_Exe *exe;
-   pid_t               pid;
 
    exe = ecore_exe_run(exec, NULL);
    return exe;




-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to