Tiling2: Get rid of the use_rows config.

diff --git a/src/modules/tiling/e_mod_config.c b/src/modules/tiling/e_mod_config.c
index 20b2d6d..33a49e7 100644 (file)
--- a/src/modules/tiling/e_mod_config.c
+++ b/src/modules/tiling/e_mod_config.c
@@ -70,7 +70,6 @@ _create_data(E_Config_Dialog *cfd __UNUSED__)
         newvd->y = vd->y;
         newvd->zone_num = vd->zone_num;
         newvd->nb_stacks = vd->nb_stacks;
-        newvd->use_rows = vd->use_rows;
 
         EINA_LIST_APPEND(cfdata->config.vdesks, newvd);
     }
@@ -237,13 +236,12 @@ _basic_apply_data(E_Config_Dialog      *cfd __UNUSED__,
             continue;
         }
 
-        if (newvd->nb_stacks != vd->nb_stacks
-        ||  newvd->use_rows != vd->use_rows) {
-            DBG("number of columns for (%d, %d, %d) changed from %d|%d"
-                " to %d|%d",
+        if (newvd->nb_stacks != vd->nb_stacks) {
+            DBG("number of columns for (%d, %d, %d) changed from %d"
+                " to %d",
                 vd->x, vd->y, vd->zone_num,
-                vd->nb_stacks, vd->use_rows,
-                newvd->nb_stacks, newvd->use_rows);
+                vd->nb_stacks,
+                newvd->nb_stacks);
             change_desk_conf(newvd);
             free(vd);
             l->data = NULL;
@@ -279,7 +277,6 @@ _basic_apply_data(E_Config_Dialog      *cfd __UNUSED__,
         newvd->y = vd->y;
         newvd->zone_num = vd->zone_num;
         newvd->nb_stacks = vd->nb_stacks;
-        newvd->use_rows = vd->use_rows;
 
         EINA_LIST_APPEND(tiling_g.config->vdesks, newvd);
     }

diff --git a/src/modules/tiling/e_mod_tiling.c b/src/modules/tiling/e_mod_tiling.c
index 909cc82..e94ca16 100644 (file)
--- a/src/modules/tiling/e_mod_tiling.c
+++ b/src/modules/tiling/e_mod_tiling.c
@@ -407,11 +407,6 @@ change_desk_conf(struct _Config_vdesk *newconf)
     check_tinfo(d);
     if (_G.tinfo->conf) {
         old_nb_stacks = _G.tinfo->conf->nb_stacks;
-        if (_G.tinfo->conf->use_rows != newconf->use_rows) {
-            _G.tinfo->conf = newconf;
-            _G.tinfo->conf->use_rows = !_G.tinfo->conf->use_rows;
-            return;
-        }
     } else {
         newconf->nb_stacks = 0;
     }
@@ -1031,7 +1026,6 @@ e_modapi_init(E_Module *m)
     E_CONFIG_VAL(_G.vdesk_edd, struct _Config_vdesk, y, INT);
     E_CONFIG_VAL(_G.vdesk_edd, struct _Config_vdesk, zone_num, INT);
     E_CONFIG_VAL(_G.vdesk_edd, struct _Config_vdesk, nb_stacks, INT);
-    E_CONFIG_VAL(_G.vdesk_edd, struct _Config_vdesk, use_rows, INT);
 
     tiling_g.config = e_config_domain_load("module.tiling", _G.config_edd);
     if (!tiling_g.config) {
@@ -1049,7 +1043,6 @@ e_modapi_init(E_Module *m)
         vd = l->data;
 
         E_CONFIG_LIMIT(vd->nb_stacks, 0, TILING_MAX_STACKS);
-        E_CONFIG_LIMIT(vd->use_rows, 0, 1);
     }
 
     desk = get_current_desk();

diff --git a/src/modules/tiling/e_mod_tiling.h b/src/modules/tiling/e_mod_tiling.h
index af84b1d..078045e 100644 (file)
--- a/src/modules/tiling/e_mod_tiling.h
+++ b/src/modules/tiling/e_mod_tiling.h
@@ -32,7 +32,6 @@ struct _Config_vdesk
    int           x, y;
    unsigned int  zone_num;
    int           nb_stacks;
-   int           use_rows;
 };
 
 struct _Config