[gnome-panel/features/layout-using-gtkgrid: 2/2] panel: don't set panel's initial size to G_MAXINT

[Philipp Kaluza <phk src gnome org>]

commit 2064049afb62fe63d955c7662365c280cc8f8757
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Mon Nov 18 23:38:27 2013 +0200

    panel: don't set panel's initial size to G_MAXINT
    
    Replacing GtkTable with GtkGrid introduced new bug. Warning is -
    'Native children wider or taller than 65535 pixels are not supported'.
    This is caused by setting panels initial size to G_MAXINT. Changing
    initial size to 0 fixes this new bug.
    
    Conflicts:
        gnome-panel/panel-widget.c

 gnome-panel/panel-widget.c |   15 ++++++---------
 1 files changed, 6 insertions(+), 9 deletions(-)
---
diff --git a/gnome-panel/panel-widget.c b/gnome-panel/panel-widget.c
index e189989..3231bde 100644
--- a/gnome-panel/panel-widget.c
+++ b/gnome-panel/panel-widget.c
@@ -1686,10 +1686,10 @@ panel_widget_init (PanelWidget *panel)
        gtk_widget_set_events (
                widget,
                gtk_widget_get_events (widget) | GDK_BUTTON_RELEASE_MASK);
-       
+
        panel->packed        = FALSE;
        panel->orient        = GTK_ORIENTATION_HORIZONTAL;
-       panel->size          = G_MAXINT;
+       panel->size          = 0;
        panel->applet_list   = NULL;
        panel->drop_widget   = widget;
        panel->open_dialogs  = NULL;
@@ -1718,21 +1718,18 @@ panel_widget_new (PanelToplevel  *toplevel,
 
        panel = g_object_new (PANEL_TYPE_WIDGET, NULL);
 
-        gtk_widget_set_has_window (GTK_WIDGET (panel), TRUE);
-        gtk_widget_set_can_focus (GTK_WIDGET (panel), TRUE);
+       gtk_widget_set_has_window (GTK_WIDGET (panel), TRUE);
+       gtk_widget_set_can_focus (GTK_WIDGET (panel), TRUE);
 
        panel->orient = orient;
        panel->sz = sz;
 
        panel->packed = packed;
-       if (packed)
-               panel->size = 0;
-       else
-               panel->size = G_MAXINT;
+       panel->size = 0;
 
        panel->toplevel    = toplevel;
        panel->drop_widget = GTK_WIDGET (toplevel);
-       
+
        return GTK_WIDGET (panel);
 }