Hi list.

I have two patches for Entrance. The first patch just fixes
typo in configure.ac. And the second one fixes compilation
failure, when Entrance is configured with --enable-grub2.

Also i'm not sure if entrance works at all -- it just starts
and then silently exits with code 0. Here is the contents of
the /var/log/entrance.log: http://pastebin.com/17XyMFbn


-- Igor
Index: configure.ac
===================================================================
--- configure.ac	(revision 76863)
+++ configure.ac	(working copy)
@@ -47,7 +47,7 @@
 
 # Grub2
 AC_ARG_ENABLE([grub2],
-   [AC_HELP_STRING([--enable-gru2b], [enable grub2 support. @<:@default=disabled@:>@])],
+   [AC_HELP_STRING([--enable-grub2], [enable grub2 support. @<:@default=disabled@:>@])],
    [
     if test "x${enableval}" = "xyes" ; then
        enable_grub2="yes"
@@ -80,7 +80,7 @@
 
 # Set edje_cc path
 AC_ARG_WITH([edje-cc],
-   [AC_HELP_STRING([ --with-edje-cc=PATH], [specify a specific path to edje_cc])],
+   [AC_HELP_STRING([--with-edje-cc=PATH], [specify a specific path to edje_cc])],
    [
     v=$withval;
     edje_cc=$v
Index: src/daemon/entrance_action.c
===================================================================
--- src/daemon/entrance_action.c	(revision 76871)
+++ src/daemon/entrance_action.c	(working copy)
@@ -211,13 +211,14 @@
         if (!grub2_ok)
           {
              grub2_ok = 1;
-             PT("GRUB2 save mode found \n");
+             PT("GRUB2 save mode found\n");
           }
         else
           {
              char *action;
              char *local;
              char *tmp;
+             char *buf;
 
              r2 += 10;
              size -= 10;
@@ -237,8 +238,11 @@
              action = malloc((tmp - r2 + 1 + 11) * sizeof (char));
              if (!action) goto end_line;
 
+             buf = alloca((tmp - r2 + 1 + 11 + 10) * sizeof (char));
+
              sprintf(action, "Reboot on %s", local);
-             PT("GRUB2 '%s'\n", action);
+             sprintf(buf, "GRUB2 '%s'\n", action);
+             PT(buf);
              _entrance_actions =
                 eina_list_append(_entrance_actions,
                                  _entrance_action_add(action,
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
enlightenment-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel

Reply via email to