From 430e75cbba9fd689078c33100509528e290b0adb Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Thu, 27 Dec 2012 05:26:34 +0000
Subject: [PATCH] backport two critical fixes to e17 branch

SVN revision: 81725
---
 AUTHORS                           |  1 +
 ChangeLog                         |  8 ++++++++
 NEWS                              | 14 ++++++++++++++
 src/modules/ibar/e_mod_main.c     |  1 +
 src/modules/tiling/e_mod_tiling.c |  4 ++--
 5 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 025552e9e..6185e8c71 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -48,3 +48,4 @@ Boris Faure <billiob@gmail.com>
 Michael Stapelberg <michael+e17@stapelberg.de>
 Stefan Sperling <stsp@openbsd.org>
 Nicolas Beaumont <nicolas.beaumont@gmail.com>
+David H. Bronke <whitelynx@gmail.com>
diff --git a/ChangeLog b/ChangeLog
index 33b318198..60e2193e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-12-24  Mike Blumenkrantz
+
+        * Fixed crash when changing ibar source
+
+2012-12-24  Boris Faure
+
+        * Fixed SIGFPE in tiling module and functionality of toggle_rows_count
+
 2012-12-21
 
         Initial release
diff --git a/NEWS b/NEWS
index e69de29bb..0d78d9df0 100644
--- a/NEWS
+++ b/NEWS
@@ -0,0 +1,14 @@
+Changes since 0.17.0:
+---------------------
+
+Additions:
+
+Deprecations:
+
+Removed:
+
+Improvements:
+
+Fixes:
+    * Fixed crash when changing ibar source
+    * Fixed SIGFPE in tiling module and functionality of toggle_rows_count
diff --git a/src/modules/ibar/e_mod_main.c b/src/modules/ibar/e_mod_main.c
index 2f397a15e..1e87a72c9 100644
--- a/src/modules/ibar/e_mod_main.c
+++ b/src/modules/ibar/e_mod_main.c
@@ -176,6 +176,7 @@ _ibar_order_refresh(IBar *b, const char *path)
           {
              if (b->io) _ibar_order_del(b);
              io->bars = eina_list_append(io->bars, b);
+             b->io = io;
           }
         /* else same order, refresh all users */
      }
diff --git a/src/modules/tiling/e_mod_tiling.c b/src/modules/tiling/e_mod_tiling.c
index bfcc1b23f..4c671f7d6 100644
--- a/src/modules/tiling/e_mod_tiling.c
+++ b/src/modules/tiling/e_mod_tiling.c
@@ -2202,7 +2202,7 @@ _move_left_cols(E_Border *bd, Eina_Bool check_moving_anims)
         for (i = 0; i < nb_stacks; i++) {
             int width;
 
-            width = w / (nb_stacks - 1 - i);
+            width = w / (nb_stacks - i);
 
             _set_stack_geometry(i, x, width);
 
@@ -2534,7 +2534,7 @@ _move_up_rows(E_Border *bd, Eina_Bool check_moving_anims)
         for (i = 0; i < nb_stacks; i++) {
             int height;
 
-            height = h / (nb_stacks - 1 - i);
+            height = h / (nb_stacks - i);
 
             _set_stack_geometry(i, y, height);