Date: Tuesday, December 3, 2013 @ 02:02:57 Author: bgyorgy Revision: 101965
archrelease: copy trunk to community-i686, community-x86_64 Added: lxlauncher/repos/community-i686/PKGBUILD (from rev 101964, lxlauncher/trunk/PKGBUILD) lxlauncher/repos/community-i686/fix-empty-launcher.patch (from rev 101964, lxlauncher/trunk/fix-empty-launcher.patch) lxlauncher/repos/community-x86_64/PKGBUILD (from rev 101964, lxlauncher/trunk/PKGBUILD) lxlauncher/repos/community-x86_64/fix-empty-launcher.patch (from rev 101964, lxlauncher/trunk/fix-empty-launcher.patch) Deleted: lxlauncher/repos/community-i686/PKGBUILD lxlauncher/repos/community-i686/fix-empty-launcher.patch lxlauncher/repos/community-x86_64/PKGBUILD lxlauncher/repos/community-x86_64/fix-empty-launcher.patch -------------------------------------------+ /PKGBUILD | 76 +++++++++++ /fix-empty-launcher.patch | 178 ++++++++++++++++++++++++++++ community-i686/PKGBUILD | 36 ----- community-i686/fix-empty-launcher.patch | 89 -------------- community-x86_64/PKGBUILD | 36 ----- community-x86_64/fix-empty-launcher.patch | 89 -------------- 6 files changed, 254 insertions(+), 250 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2013-12-03 01:02:49 UTC (rev 101964) +++ community-i686/PKGBUILD 2013-12-03 01:02:57 UTC (rev 101965) @@ -1,36 +0,0 @@ -# $Id$ -# Maintainer: Bartłomiej Piotrowski <nos...@bpiotrowski.pl> -# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> -# Contributor: Geoffroy Carrier <geoffroy.carr...@koon.fr> - -pkgname=lxlauncher -pkgver=0.2.2 -pkgrel=4 -pkgdesc='Open source clone of the Asus launcher for EeePC' -arch=('i686' 'x86_64') -license=('GPL2') -url='http://lxde.org/' -groups=('lxde') -depends=('gtk2' 'startup-notification' 'lxmenu-data' 'menu-cache') -makedepends=('intltool') -source=(http://downloads.sourceforge.net/sourceforge/lxde/$pkgname-$pkgver.tar.gz - fix-empty-launcher.patch) -md5sums=('16df627447838b170a72cc3a9ee21497' - '4dd715f9cccf04ef87c662cee1dcb798') - -prepare() { - cd $pkgname-$pkgver - # Fix empty launcher - patch -Np1 -i ../fix-empty-launcher.patch -} - -build() { - cd $pkgname-$pkgver - ./configure --sysconfdir=/etc --prefix=/usr - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} Copied: lxlauncher/repos/community-i686/PKGBUILD (from rev 101964, lxlauncher/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2013-12-03 01:02:57 UTC (rev 101965) @@ -0,0 +1,38 @@ +# $Id$ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> +# Contributor: Bartłomiej Piotrowski <nos...@bpiotrowski.pl> +# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> +# Contributor: Geoffroy Carrier <geoffroy.carr...@koon.fr> + +pkgname=lxlauncher +pkgver=0.2.2 +pkgrel=5 +pkgdesc='Open source clone of the Asus launcher for EeePC' +arch=('i686' 'x86_64') +license=('GPL2') +url='http://lxde.org/' +groups=('lxde') +depends=('gtk2' 'startup-notification' 'lxmenu-data' 'menu-cache') +makedepends=('intltool') +backup=('etc/xdg/lxlauncher/gtkrc' 'etc/xdg/lxlauncher/settings.conf') +source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz + fix-empty-launcher.patch) +md5sums=('16df627447838b170a72cc3a9ee21497' + '4dd715f9cccf04ef87c662cee1dcb798') + +prepare() { + cd $pkgname-$pkgver + # Fix empty launcher + patch -Np1 -i ../fix-empty-launcher.patch +} + +build() { + cd $pkgname-$pkgver + ./configure --sysconfdir=/etc --prefix=/usr + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} Deleted: community-i686/fix-empty-launcher.patch =================================================================== --- community-i686/fix-empty-launcher.patch 2013-12-03 01:02:49 UTC (rev 101964) +++ community-i686/fix-empty-launcher.patch 2013-12-03 01:02:57 UTC (rev 101965) @@ -1,89 +0,0 @@ -From 56a244f2aa3c474b2506847ba9a2f5a21cb8efc2 Mon Sep 17 00:00:00 2001 -From: Julien Lavergne <julien.laver...@gmail.com> -Date: Tue, 26 Jul 2011 01:21:04 +0200 -Subject: [PATCH] Fix GtkAllocation to fix empty lxlauncher - ---- - src/exo-wrap-table.c | 26 ++++++++++++++++---------- - 1 files changed, 16 insertions(+), 10 deletions(-) - -diff --git a/src/exo-wrap-table.c b/src/exo-wrap-table.c -index c691434..f48322f 100644 ---- a/src/exo-wrap-table.c -+++ b/src/exo-wrap-table.c -@@ -326,14 +326,14 @@ exo_wrap_table_size_request (GtkWidget *widget, - if (G_LIKELY (num_children > 0)) - { - #if GTK_CHECK_VERSION(2,18,0) -- GtkAllocation allocation; -- gtk_widget_set_allocation(widget, &allocation); -- num_cols = exo_wrap_table_get_num_fitting (allocation.width -+ GtkAllocation *allocation = g_new0 (GtkAllocation, 1); -+ gtk_widget_get_allocation(GTK_WIDGET(widget), allocation); -+ num_cols = exo_wrap_table_get_num_fitting (allocation->width - - gtk_container_get_border_width(GTK_CONTAINER (widget)) * 2, - table->priv->col_spacing, max_width); - #else - num_cols = exo_wrap_table_get_num_fitting (widget->allocation.width -- - gtk_container_get_border_width(GTK_CONTAINER (widget)) * 2, -+ - GTK_CONTAINER (widget)->border_width * 2, - table->priv->col_spacing, max_width); - #endif - num_rows = num_children / num_cols; -@@ -345,7 +345,12 @@ exo_wrap_table_size_request (GtkWidget *widget, - requisition->width = -1; - requisition->height = (num_rows * max_height) - + (num_rows - 1) * table->priv->col_spacing -+#if GTK_CHECK_VERSION(2,18,0) - + gtk_container_get_border_width(GTK_CONTAINER (widget)) * 2; -+ g_free (allocation); -+#else -+ + GTK_CONTAINER (widget)->border_width * 2; -+#endif - } - else - { -@@ -479,8 +484,8 @@ exo_wrap_table_layout (ExoWrapTable *table) - gint max_height; - gint max_width; - #if GTK_CHECK_VERSION(2,18,0) -- GtkAllocation allocation; -- gtk_widget_set_allocation(GTK_WIDGET(table), &allocation); -+ GtkAllocation *allocation = g_new0 (GtkAllocation, 1); -+ gtk_widget_get_allocation(GTK_WIDGET(table), allocation); - #endif - - /* determine the number of visible children and the max size */ -@@ -490,7 +495,7 @@ exo_wrap_table_layout (ExoWrapTable *table) - - /* determine the number of columns */ - #if GTK_CHECK_VERSION(2,18,0) -- num_cols = exo_wrap_table_get_num_fitting (allocation.width -+ num_cols = exo_wrap_table_get_num_fitting (allocation->width - - gtk_container_get_border_width(GTK_CONTAINER (table)) * 2, - table->priv->col_spacing, max_width); - #else -@@ -509,8 +514,8 @@ exo_wrap_table_layout (ExoWrapTable *table) - - /* determine the horizontal bounds */ - #if GTK_CHECK_VERSION(2,18,0) -- x0 = allocation.x + gtk_container_get_border_width(GTK_CONTAINER (table)); -- x1 = x0 + allocation.width - gtk_container_get_border_width(GTK_CONTAINER (table)); -+ x0 = allocation->x + gtk_container_get_border_width(GTK_CONTAINER (table)); -+ x1 = x0 + allocation->width - gtk_container_get_border_width(GTK_CONTAINER (table)); - #else - x0 = GTK_WIDGET (table)->allocation.x + GTK_CONTAINER (table)->border_width; - x1 = x0 + GTK_WIDGET (table)->allocation.width - GTK_CONTAINER (table)->border_width; -@@ -519,7 +524,8 @@ exo_wrap_table_layout (ExoWrapTable *table) - /* initialize the position */ - x = x0; - #if GTK_CHECK_VERSION(2,18,0) -- y = allocation.y + gtk_container_get_border_width(GTK_CONTAINER (table)); -+ y = allocation->y + gtk_container_get_border_width(GTK_CONTAINER (table)); -+ g_free (allocation); - #else - y = GTK_WIDGET (table)->allocation.y + GTK_CONTAINER (table)->border_width; - #endif --- -1.7.4.1 - Copied: lxlauncher/repos/community-i686/fix-empty-launcher.patch (from rev 101964, lxlauncher/trunk/fix-empty-launcher.patch) =================================================================== --- community-i686/fix-empty-launcher.patch (rev 0) +++ community-i686/fix-empty-launcher.patch 2013-12-03 01:02:57 UTC (rev 101965) @@ -0,0 +1,89 @@ +From 56a244f2aa3c474b2506847ba9a2f5a21cb8efc2 Mon Sep 17 00:00:00 2001 +From: Julien Lavergne <julien.laver...@gmail.com> +Date: Tue, 26 Jul 2011 01:21:04 +0200 +Subject: [PATCH] Fix GtkAllocation to fix empty lxlauncher + +--- + src/exo-wrap-table.c | 26 ++++++++++++++++---------- + 1 files changed, 16 insertions(+), 10 deletions(-) + +diff --git a/src/exo-wrap-table.c b/src/exo-wrap-table.c +index c691434..f48322f 100644 +--- a/src/exo-wrap-table.c ++++ b/src/exo-wrap-table.c +@@ -326,14 +326,14 @@ exo_wrap_table_size_request (GtkWidget *widget, + if (G_LIKELY (num_children > 0)) + { + #if GTK_CHECK_VERSION(2,18,0) +- GtkAllocation allocation; +- gtk_widget_set_allocation(widget, &allocation); +- num_cols = exo_wrap_table_get_num_fitting (allocation.width ++ GtkAllocation *allocation = g_new0 (GtkAllocation, 1); ++ gtk_widget_get_allocation(GTK_WIDGET(widget), allocation); ++ num_cols = exo_wrap_table_get_num_fitting (allocation->width + - gtk_container_get_border_width(GTK_CONTAINER (widget)) * 2, + table->priv->col_spacing, max_width); + #else + num_cols = exo_wrap_table_get_num_fitting (widget->allocation.width +- - gtk_container_get_border_width(GTK_CONTAINER (widget)) * 2, ++ - GTK_CONTAINER (widget)->border_width * 2, + table->priv->col_spacing, max_width); + #endif + num_rows = num_children / num_cols; +@@ -345,7 +345,12 @@ exo_wrap_table_size_request (GtkWidget *widget, + requisition->width = -1; + requisition->height = (num_rows * max_height) + + (num_rows - 1) * table->priv->col_spacing ++#if GTK_CHECK_VERSION(2,18,0) + + gtk_container_get_border_width(GTK_CONTAINER (widget)) * 2; ++ g_free (allocation); ++#else ++ + GTK_CONTAINER (widget)->border_width * 2; ++#endif + } + else + { +@@ -479,8 +484,8 @@ exo_wrap_table_layout (ExoWrapTable *table) + gint max_height; + gint max_width; + #if GTK_CHECK_VERSION(2,18,0) +- GtkAllocation allocation; +- gtk_widget_set_allocation(GTK_WIDGET(table), &allocation); ++ GtkAllocation *allocation = g_new0 (GtkAllocation, 1); ++ gtk_widget_get_allocation(GTK_WIDGET(table), allocation); + #endif + + /* determine the number of visible children and the max size */ +@@ -490,7 +495,7 @@ exo_wrap_table_layout (ExoWrapTable *table) + + /* determine the number of columns */ + #if GTK_CHECK_VERSION(2,18,0) +- num_cols = exo_wrap_table_get_num_fitting (allocation.width ++ num_cols = exo_wrap_table_get_num_fitting (allocation->width + - gtk_container_get_border_width(GTK_CONTAINER (table)) * 2, + table->priv->col_spacing, max_width); + #else +@@ -509,8 +514,8 @@ exo_wrap_table_layout (ExoWrapTable *table) + + /* determine the horizontal bounds */ + #if GTK_CHECK_VERSION(2,18,0) +- x0 = allocation.x + gtk_container_get_border_width(GTK_CONTAINER (table)); +- x1 = x0 + allocation.width - gtk_container_get_border_width(GTK_CONTAINER (table)); ++ x0 = allocation->x + gtk_container_get_border_width(GTK_CONTAINER (table)); ++ x1 = x0 + allocation->width - gtk_container_get_border_width(GTK_CONTAINER (table)); + #else + x0 = GTK_WIDGET (table)->allocation.x + GTK_CONTAINER (table)->border_width; + x1 = x0 + GTK_WIDGET (table)->allocation.width - GTK_CONTAINER (table)->border_width; +@@ -519,7 +524,8 @@ exo_wrap_table_layout (ExoWrapTable *table) + /* initialize the position */ + x = x0; + #if GTK_CHECK_VERSION(2,18,0) +- y = allocation.y + gtk_container_get_border_width(GTK_CONTAINER (table)); ++ y = allocation->y + gtk_container_get_border_width(GTK_CONTAINER (table)); ++ g_free (allocation); + #else + y = GTK_WIDGET (table)->allocation.y + GTK_CONTAINER (table)->border_width; + #endif +-- +1.7.4.1 + Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2013-12-03 01:02:49 UTC (rev 101964) +++ community-x86_64/PKGBUILD 2013-12-03 01:02:57 UTC (rev 101965) @@ -1,36 +0,0 @@ -# $Id$ -# Maintainer: Bartłomiej Piotrowski <nos...@bpiotrowski.pl> -# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> -# Contributor: Geoffroy Carrier <geoffroy.carr...@koon.fr> - -pkgname=lxlauncher -pkgver=0.2.2 -pkgrel=4 -pkgdesc='Open source clone of the Asus launcher for EeePC' -arch=('i686' 'x86_64') -license=('GPL2') -url='http://lxde.org/' -groups=('lxde') -depends=('gtk2' 'startup-notification' 'lxmenu-data' 'menu-cache') -makedepends=('intltool') -source=(http://downloads.sourceforge.net/sourceforge/lxde/$pkgname-$pkgver.tar.gz - fix-empty-launcher.patch) -md5sums=('16df627447838b170a72cc3a9ee21497' - '4dd715f9cccf04ef87c662cee1dcb798') - -prepare() { - cd $pkgname-$pkgver - # Fix empty launcher - patch -Np1 -i ../fix-empty-launcher.patch -} - -build() { - cd $pkgname-$pkgver - ./configure --sysconfdir=/etc --prefix=/usr - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} Copied: lxlauncher/repos/community-x86_64/PKGBUILD (from rev 101964, lxlauncher/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2013-12-03 01:02:57 UTC (rev 101965) @@ -0,0 +1,38 @@ +# $Id$ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> +# Contributor: Bartłomiej Piotrowski <nos...@bpiotrowski.pl> +# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> +# Contributor: Geoffroy Carrier <geoffroy.carr...@koon.fr> + +pkgname=lxlauncher +pkgver=0.2.2 +pkgrel=5 +pkgdesc='Open source clone of the Asus launcher for EeePC' +arch=('i686' 'x86_64') +license=('GPL2') +url='http://lxde.org/' +groups=('lxde') +depends=('gtk2' 'startup-notification' 'lxmenu-data' 'menu-cache') +makedepends=('intltool') +backup=('etc/xdg/lxlauncher/gtkrc' 'etc/xdg/lxlauncher/settings.conf') +source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz + fix-empty-launcher.patch) +md5sums=('16df627447838b170a72cc3a9ee21497' + '4dd715f9cccf04ef87c662cee1dcb798') + +prepare() { + cd $pkgname-$pkgver + # Fix empty launcher + patch -Np1 -i ../fix-empty-launcher.patch +} + +build() { + cd $pkgname-$pkgver + ./configure --sysconfdir=/etc --prefix=/usr + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} Deleted: community-x86_64/fix-empty-launcher.patch =================================================================== --- community-x86_64/fix-empty-launcher.patch 2013-12-03 01:02:49 UTC (rev 101964) +++ community-x86_64/fix-empty-launcher.patch 2013-12-03 01:02:57 UTC (rev 101965) @@ -1,89 +0,0 @@ -From 56a244f2aa3c474b2506847ba9a2f5a21cb8efc2 Mon Sep 17 00:00:00 2001 -From: Julien Lavergne <julien.laver...@gmail.com> -Date: Tue, 26 Jul 2011 01:21:04 +0200 -Subject: [PATCH] Fix GtkAllocation to fix empty lxlauncher - ---- - src/exo-wrap-table.c | 26 ++++++++++++++++---------- - 1 files changed, 16 insertions(+), 10 deletions(-) - -diff --git a/src/exo-wrap-table.c b/src/exo-wrap-table.c -index c691434..f48322f 100644 ---- a/src/exo-wrap-table.c -+++ b/src/exo-wrap-table.c -@@ -326,14 +326,14 @@ exo_wrap_table_size_request (GtkWidget *widget, - if (G_LIKELY (num_children > 0)) - { - #if GTK_CHECK_VERSION(2,18,0) -- GtkAllocation allocation; -- gtk_widget_set_allocation(widget, &allocation); -- num_cols = exo_wrap_table_get_num_fitting (allocation.width -+ GtkAllocation *allocation = g_new0 (GtkAllocation, 1); -+ gtk_widget_get_allocation(GTK_WIDGET(widget), allocation); -+ num_cols = exo_wrap_table_get_num_fitting (allocation->width - - gtk_container_get_border_width(GTK_CONTAINER (widget)) * 2, - table->priv->col_spacing, max_width); - #else - num_cols = exo_wrap_table_get_num_fitting (widget->allocation.width -- - gtk_container_get_border_width(GTK_CONTAINER (widget)) * 2, -+ - GTK_CONTAINER (widget)->border_width * 2, - table->priv->col_spacing, max_width); - #endif - num_rows = num_children / num_cols; -@@ -345,7 +345,12 @@ exo_wrap_table_size_request (GtkWidget *widget, - requisition->width = -1; - requisition->height = (num_rows * max_height) - + (num_rows - 1) * table->priv->col_spacing -+#if GTK_CHECK_VERSION(2,18,0) - + gtk_container_get_border_width(GTK_CONTAINER (widget)) * 2; -+ g_free (allocation); -+#else -+ + GTK_CONTAINER (widget)->border_width * 2; -+#endif - } - else - { -@@ -479,8 +484,8 @@ exo_wrap_table_layout (ExoWrapTable *table) - gint max_height; - gint max_width; - #if GTK_CHECK_VERSION(2,18,0) -- GtkAllocation allocation; -- gtk_widget_set_allocation(GTK_WIDGET(table), &allocation); -+ GtkAllocation *allocation = g_new0 (GtkAllocation, 1); -+ gtk_widget_get_allocation(GTK_WIDGET(table), allocation); - #endif - - /* determine the number of visible children and the max size */ -@@ -490,7 +495,7 @@ exo_wrap_table_layout (ExoWrapTable *table) - - /* determine the number of columns */ - #if GTK_CHECK_VERSION(2,18,0) -- num_cols = exo_wrap_table_get_num_fitting (allocation.width -+ num_cols = exo_wrap_table_get_num_fitting (allocation->width - - gtk_container_get_border_width(GTK_CONTAINER (table)) * 2, - table->priv->col_spacing, max_width); - #else -@@ -509,8 +514,8 @@ exo_wrap_table_layout (ExoWrapTable *table) - - /* determine the horizontal bounds */ - #if GTK_CHECK_VERSION(2,18,0) -- x0 = allocation.x + gtk_container_get_border_width(GTK_CONTAINER (table)); -- x1 = x0 + allocation.width - gtk_container_get_border_width(GTK_CONTAINER (table)); -+ x0 = allocation->x + gtk_container_get_border_width(GTK_CONTAINER (table)); -+ x1 = x0 + allocation->width - gtk_container_get_border_width(GTK_CONTAINER (table)); - #else - x0 = GTK_WIDGET (table)->allocation.x + GTK_CONTAINER (table)->border_width; - x1 = x0 + GTK_WIDGET (table)->allocation.width - GTK_CONTAINER (table)->border_width; -@@ -519,7 +524,8 @@ exo_wrap_table_layout (ExoWrapTable *table) - /* initialize the position */ - x = x0; - #if GTK_CHECK_VERSION(2,18,0) -- y = allocation.y + gtk_container_get_border_width(GTK_CONTAINER (table)); -+ y = allocation->y + gtk_container_get_border_width(GTK_CONTAINER (table)); -+ g_free (allocation); - #else - y = GTK_WIDGET (table)->allocation.y + GTK_CONTAINER (table)->border_width; - #endif --- -1.7.4.1 - Copied: lxlauncher/repos/community-x86_64/fix-empty-launcher.patch (from rev 101964, lxlauncher/trunk/fix-empty-launcher.patch) =================================================================== --- community-x86_64/fix-empty-launcher.patch (rev 0) +++ community-x86_64/fix-empty-launcher.patch 2013-12-03 01:02:57 UTC (rev 101965) @@ -0,0 +1,89 @@ +From 56a244f2aa3c474b2506847ba9a2f5a21cb8efc2 Mon Sep 17 00:00:00 2001 +From: Julien Lavergne <julien.laver...@gmail.com> +Date: Tue, 26 Jul 2011 01:21:04 +0200 +Subject: [PATCH] Fix GtkAllocation to fix empty lxlauncher + +--- + src/exo-wrap-table.c | 26 ++++++++++++++++---------- + 1 files changed, 16 insertions(+), 10 deletions(-) + +diff --git a/src/exo-wrap-table.c b/src/exo-wrap-table.c +index c691434..f48322f 100644 +--- a/src/exo-wrap-table.c ++++ b/src/exo-wrap-table.c +@@ -326,14 +326,14 @@ exo_wrap_table_size_request (GtkWidget *widget, + if (G_LIKELY (num_children > 0)) + { + #if GTK_CHECK_VERSION(2,18,0) +- GtkAllocation allocation; +- gtk_widget_set_allocation(widget, &allocation); +- num_cols = exo_wrap_table_get_num_fitting (allocation.width ++ GtkAllocation *allocation = g_new0 (GtkAllocation, 1); ++ gtk_widget_get_allocation(GTK_WIDGET(widget), allocation); ++ num_cols = exo_wrap_table_get_num_fitting (allocation->width + - gtk_container_get_border_width(GTK_CONTAINER (widget)) * 2, + table->priv->col_spacing, max_width); + #else + num_cols = exo_wrap_table_get_num_fitting (widget->allocation.width +- - gtk_container_get_border_width(GTK_CONTAINER (widget)) * 2, ++ - GTK_CONTAINER (widget)->border_width * 2, + table->priv->col_spacing, max_width); + #endif + num_rows = num_children / num_cols; +@@ -345,7 +345,12 @@ exo_wrap_table_size_request (GtkWidget *widget, + requisition->width = -1; + requisition->height = (num_rows * max_height) + + (num_rows - 1) * table->priv->col_spacing ++#if GTK_CHECK_VERSION(2,18,0) + + gtk_container_get_border_width(GTK_CONTAINER (widget)) * 2; ++ g_free (allocation); ++#else ++ + GTK_CONTAINER (widget)->border_width * 2; ++#endif + } + else + { +@@ -479,8 +484,8 @@ exo_wrap_table_layout (ExoWrapTable *table) + gint max_height; + gint max_width; + #if GTK_CHECK_VERSION(2,18,0) +- GtkAllocation allocation; +- gtk_widget_set_allocation(GTK_WIDGET(table), &allocation); ++ GtkAllocation *allocation = g_new0 (GtkAllocation, 1); ++ gtk_widget_get_allocation(GTK_WIDGET(table), allocation); + #endif + + /* determine the number of visible children and the max size */ +@@ -490,7 +495,7 @@ exo_wrap_table_layout (ExoWrapTable *table) + + /* determine the number of columns */ + #if GTK_CHECK_VERSION(2,18,0) +- num_cols = exo_wrap_table_get_num_fitting (allocation.width ++ num_cols = exo_wrap_table_get_num_fitting (allocation->width + - gtk_container_get_border_width(GTK_CONTAINER (table)) * 2, + table->priv->col_spacing, max_width); + #else +@@ -509,8 +514,8 @@ exo_wrap_table_layout (ExoWrapTable *table) + + /* determine the horizontal bounds */ + #if GTK_CHECK_VERSION(2,18,0) +- x0 = allocation.x + gtk_container_get_border_width(GTK_CONTAINER (table)); +- x1 = x0 + allocation.width - gtk_container_get_border_width(GTK_CONTAINER (table)); ++ x0 = allocation->x + gtk_container_get_border_width(GTK_CONTAINER (table)); ++ x1 = x0 + allocation->width - gtk_container_get_border_width(GTK_CONTAINER (table)); + #else + x0 = GTK_WIDGET (table)->allocation.x + GTK_CONTAINER (table)->border_width; + x1 = x0 + GTK_WIDGET (table)->allocation.width - GTK_CONTAINER (table)->border_width; +@@ -519,7 +524,8 @@ exo_wrap_table_layout (ExoWrapTable *table) + /* initialize the position */ + x = x0; + #if GTK_CHECK_VERSION(2,18,0) +- y = allocation.y + gtk_container_get_border_width(GTK_CONTAINER (table)); ++ y = allocation->y + gtk_container_get_border_width(GTK_CONTAINER (table)); ++ g_free (allocation); + #else + y = GTK_WIDGET (table)->allocation.y + GTK_CONTAINER (table)->border_width; + #endif +-- +1.7.4.1 +