E SVN: mekius trunk/e/src/bin

[<no-reply@en...>]

Author:       mekius
Date:         2008-08-30 12:14:04 -0700 (Sat, 30 Aug 2008)
New Revision: 35752

Modified:
  trunk/e/src/bin/e_remote_main.c 
Log:

Correct help message.

Modified: trunk/e/src/bin/e_remote_main.c
===================================================================
--- trunk/e/src/bin/e_remote_main.c	2008-08-30 15:56:32 UTC (rev 35751)
+++ trunk/e/src/bin/e_remote_main.c	2008-08-30 19:14:04 UTC (rev 35752)
@@ -85,7 +85,7 @@
    if (!_e_ipc_init())
      {
 	printf("ERROR: Enlightenment_remote cannot set up the IPC socket.\n"
-	       "Maybe try the '-display :0.0' option?\n");
+	       "Try setting DISPLAY=:0 in your environment.\n");
 	exit(-1);
      }
    e_ipc_codec_init();

E SVN: mekius trunk/e/src/bin

[<no-reply@en...>]

Author:       mekius
Date:         2008-08-30 12:14:04 -0700 (Sat, 30 Aug 2008)
New Revision: 35752

Modified:
  trunk/e/src/bin/e_remote_main.c 
Log:

Correct help message.

Modified: trunk/e/src/bin/e_remote_main.c
===================================================================
--- trunk/e/src/bin/e_remote_main.c	2008-08-30 15:56:32 UTC (rev 35751)
+++ trunk/e/src/bin/e_remote_main.c	2008-08-30 19:14:04 UTC (rev 35752)
@@ -85,7 +85,7 @@
    if (!_e_ipc_init())
      {
 	printf("ERROR: Enlightenment_remote cannot set up the IPC socket.\n"
-	       "Maybe try the '-display :0.0' option?\n");
+	       "Try setting DISPLAY=:0 in your environment.\n");
 	exit(-1);
      }
    e_ipc_codec_init();

E SVN: mekius trunk/e/src/bin

[<no-reply@en...>]

Author:       mekius
Date:         2008-09-01 13:15:13 -0700 (Mon, 01 Sep 2008)
New Revision: 35782

Modified:
  trunk/e/src/bin/e_config.c 
Log:

Be a little more careful with saving config data.  Don't assume rename will work in all cases.  Make sure to rebuild ecore before updating E, otherwise your config will not save.

Modified: trunk/e/src/bin/e_config.c
===================================================================
--- trunk/e/src/bin/e_config.c	2008-09-01 20:13:00 UTC (rev 35781)
+++ trunk/e/src/bin/e_config.c	2008-09-01 20:15:13 UTC (rev 35782)
@@ -1904,12 +1904,10 @@
 	  {
 	     int ret;
 	     
-	     ret = rename(buf2, buf);
-	     if (ret < 0) 
+             ret = ecore_file_mv(buf2, buf);
+             if (!ret)
 	       {
-		  /* FIXME: do we want to trap individual errno
-		   and provide a short blurp to the user? */
-		  perror("rename");
+                  printf("*** Error saving profile. ***");
 	       }
 	  }
 	ecore_file_unlink(buf2);
@@ -1940,9 +1938,12 @@
 	ok = eet_data_write(ef, edd, "config", data, 1);
 	if (_e_config_eet_close_handle(ef, buf2))
 	  {
-	     ret = rename(buf2, buf);
-	     if (ret < 0) perror("rename");
-	  }
+             ret = ecore_file_mv(buf2, buf);
+             if (!ret)
+	       {
+                  printf("*** Error saving profile. ***");
+	       }
+          }
 	ecore_file_unlink(buf2);
      }
    return ok;

E SVN: mekius trunk/e/src/bin

[<no-reply@en...>]

Author:       mekius
Date:         2008-09-01 20:11:55 -0700 (Mon, 01 Sep 2008)
New Revision: 35788

Modified:
  trunk/e/src/bin/e_int_gadcon_config.c 
Log:

Uhh, who was freeing local list pointers?

Modified: trunk/e/src/bin/e_int_gadcon_config.c
===================================================================
--- trunk/e/src/bin/e_int_gadcon_config.c	2008-09-02 02:44:47 UTC (rev 35787)
+++ trunk/e/src/bin/e_int_gadcon_config.c	2008-09-02 03:11:55 UTC (rev 35788)
@@ -266,8 +266,6 @@
    e_widget_ilist_thaw(cfdata->o_sel);
    edje_thaw();
    evas_event_thaw(evas);
-   if (l) evas_list_free(l);
-   if (l2) evas_list_free(l2);
 }
 
 static void 
@@ -299,7 +297,6 @@
         _load_sel_gadgets(cfdata);
         e_widget_ilist_selected_set(cfdata->o_sel, i);
      }
-   if (l) evas_list_free(l);
 }
 
 static void 
@@ -319,7 +316,7 @@
         if (!item->selected) continue;
         name = (char *)e_widget_ilist_nth_data_get(cfdata->o_sel, i);
         if (!name) continue;
-        for (g = cfdata->gc->cf->clients; g; g = g->next) 
+        for (g = cfdata->gc->cf->clients; g; g = g->next)
           {
              E_Config_Gadcon_Client *cgc;
 
@@ -342,8 +339,6 @@
          * more than one selected */
         e_widget_ilist_selected_set(cfdata->o_sel, 0);
      }
-   if (g) evas_list_free(g);
-   if (l) evas_list_free(l);
 }
 
 static void 

E SVN: mekius trunk/e/src/bin

[Enlightenment SVN <no-reply@en...>]

Log:
  A little shuffling around and ilist is a bit nicer with thumbscroll.  If I broke it at all, let me know.  I believe I tested everything though.
Author:       mekius
Date:         2008-11-20 21:36:08 -0800 (Thu, 20 Nov 2008)
New Revision: 37723

Modified:
  trunk/e/src/bin/e_ilist.c 

Modified: trunk/e/src/bin/e_ilist.c
===================================================================
--- trunk/e/src/bin/e_ilist.c	2008-11-21 04:35:26 UTC (rev 37722)
+++ trunk/e/src/bin/e_ilist.c	2008-11-21 05:36:08 UTC (rev 37723)
@@ -935,8 +935,6 @@
    E_Smart_Data *sd;
    Evas_Event_Mouse_Down *ev;
    E_Ilist_Item *si;
-   Eina_List *l = NULL;
-   int i;
 
    ev = event_info;
    si = data;
@@ -948,26 +946,6 @@
    /* NB: Remove if headers ever become selectable */
    if (si->header) return;
 
-   if (!sd->items) return;
-   for (i = 0, l = sd->items; l; l = l->next, i++) 
-     {
-	if (l->data == si) 
-	  {
-	     if (!sd->multi_select)
-	       e_ilist_selected_set(sd->o_smart, i);
-	     else 
-	       {
-		  if (evas_key_modifier_is_set(ev->modifiers, "Shift"))
-		    e_ilist_range_select(sd->o_smart, i);
-		  else if (evas_key_modifier_is_set(ev->modifiers, "Control"))
-		    e_ilist_multi_select(sd->o_smart, i);
-		  else 
-		    e_ilist_selected_set(sd->o_smart, i);
-	       }
-	     break;
-	  }
-     }
-
    if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
      evas_object_smart_callback_call(sd->o_smart, "selected", NULL);
 }
@@ -978,6 +956,8 @@
    E_Smart_Data *sd;
    Evas_Event_Mouse_Up *ev;
    E_Ilist_Item *si;
+   Eina_List *l = NULL;
+   int i;
 
    ev = event_info;
    si = data;
@@ -989,13 +969,35 @@
    /* NB: Remove if headers ever become selectable */
    if (si->header) return;
 
-   if ((!sd->items) || (!sd->selector)) return;
-   if (!(si = eina_list_nth(sd->items, sd->selected))) return;
    if (sd->on_hold)
      {
 	sd->on_hold = 0;
 	return;
      }
+
+   if ((!sd->items)) return;
+
+   for (i = 0, l = sd->items; l; l = l->next, i++) 
+     {
+	if (l->data == si) 
+	  {
+	     if (!sd->multi_select)
+	       e_ilist_selected_set(sd->o_smart, i);
+	     else 
+	       {
+		  if (evas_key_modifier_is_set(ev->modifiers, "Shift"))
+		    e_ilist_range_select(sd->o_smart, i);
+		  else if (evas_key_modifier_is_set(ev->modifiers, "Control"))
+		    e_ilist_multi_select(sd->o_smart, i);
+		  else 
+		    e_ilist_selected_set(sd->o_smart, i);
+	       }
+	     break;
+	  }
+     }
+
+   if(!sd->selector) return;
+   if (!(si = eina_list_nth(sd->items, sd->selected))) return;   
    if (si->func) si->func(si->data, si->data2);
 }
 

E SVN: mekius trunk/e/src/bin

[Enlightenment SVN <no-reply@en...>]

Log:
  Fix a bug that was deleting a directory when you moved it into itself.
Author:       mekius
Date:         2008-11-22 00:48:36 -0800 (Sat, 22 Nov 2008)
New Revision: 37743

Modified:
  trunk/e/src/bin/e_fm_op.c 

Modified: trunk/e/src/bin/e_fm_op.c
===================================================================
--- trunk/e/src/bin/e_fm_op.c	2008-11-22 08:42:54 UTC (rev 37742)
+++ trunk/e/src/bin/e_fm_op.c	2008-11-22 08:48:36 UTC (rev 37743)
@@ -130,6 +130,7 @@
    char buf[PATH_MAX];
    const char *name = NULL;
    E_Fm_Op_Type type;
+   char *p = NULL, *p2 = NULL;
 
    ecore_init();
    eina_stringshare_init();
@@ -165,9 +166,18 @@
         if ((argc >= 4) && (ecore_file_is_dir(argv[last])))
           {
              if (argv[last][strlen(argv[last]) - 1] == '/') byte = "";
+             p2 = ecore_file_realpath(argv[last]);
+          
+             for(;i < last; i++)
+               {
+                  p = ecore_file_realpath(argv[i]);
+ 
+                  // Don't move a dir into itself
+                  if (p && p2 && ecore_file_is_dir(argv[i]) && 
+                                 (strstr(p2,p) == p2)
+                     )
+                    continue;
 
-             while (i < last)
-               {
                   name = ecore_file_file_get(argv[i]);
                   task = _e_fm_op_task_new();
                   task->type = type;
@@ -182,15 +192,34 @@
                   else
                     _e_fm_op_scan_queue = 
                     eina_list_append(_e_fm_op_scan_queue, task);
-
-                  i++;
                }
           }
         else if (argc == 4)
           {
+             snprintf(buf, sizeof(buf), "%s/%s", 
+                           ecore_file_realpath(argv[i]),
+                           ecore_file_file_get(argv[i])
+                     );
+             p = strdup(buf);
+          
+             snprintf(buf, sizeof(buf), "%s/%s", 
+                           ecore_file_realpath(argv[last]),
+                           ecore_file_file_get(argv[last])
+                     );
+             p2 = strdup(buf);
+
+             // Don't move a file on top of itself.
+             i = (strlen(p) == strlen(p2)) && !strncmp(p,p2,strlen(p));
+             free(p);
+             free(p2);
+             if (i) goto quit;
+
+             // Try a rename
              if ((type == E_FM_OP_MOVE) && (rename(argv[2], argv[3]) == 0))
                goto quit;
-
+             
+             // If that does work, setup a copy and delete operation.
+             // It's not atomic, but it's the best we can do.
              task = _e_fm_op_task_new();
              task->type = type;
              task->src.name = eina_stringshare_add(argv[2]);