[maemo-commits] [maemo-commits] r15495 - in projects/haf/tags/gtk+2.0/2.10.12-1~fremantle2: debian gtk

From: subversion at stage.maemo.org subversion at stage.maemo.org
Date: Tue Apr 29 09:54:04 EEST 2008 
Author: klattimer
Date: 2008-04-29 09:54:02 +0300 (Tue, 29 Apr 2008)
New Revision: 15495

Modified:
   projects/haf/tags/gtk+2.0/2.10.12-1~fremantle2/debian/control
   projects/haf/tags/gtk+2.0/2.10.12-1~fremantle2/debian/control.in
   projects/haf/tags/gtk+2.0/2.10.12-1~fremantle2/gtk/gtkdialog.c
Log:
2008-04-29 Karl Lattimer <karl.lattimer at nokia.com>

 * Applied patch from igalia to newly created branch, for testing gtkdialog changes for fremantle, internationalization tests



Modified: projects/haf/tags/gtk+2.0/2.10.12-1~fremantle2/debian/control
===================================================================
--- projects/haf/tags/gtk+2.0/2.10.12-1~fremantle2/debian/control	2008-04-29 06:34:28 UTC (rev 15494)
+++ projects/haf/tags/gtk+2.0/2.10.12-1~fremantle2/debian/control	2008-04-29 06:54:02 UTC (rev 15495)
@@ -1,5 +1,5 @@
 Source: gtk+2.0
-Section: libs
+Section: user/libs
 Priority: optional
 Maintainer: Xan Lopez <xan.lopez at nokia.com>
 Build-Depends: debhelper (>> 4.0.0), gettext, pkg-config, libglib2.0-dev (>= 2.12.12-1osso9), libpango1.0-dev (>= 1.12.0), libatk1.0-dev (>= 1.9.0), libcairo2-dev (>= 1.2.0), libx11-dev, libxext-dev, libxi-dev, libxrandr-dev, libxt-dev, libxrender-dev, libxft-dev, libxcursor-dev,  libjpeg62-dev, libpng12-dev, gtk-doc-tools, libtiff4-dev, libexpat1-dev, libxfixes-dev, libtool (>= 1.5.12), libxtst-dev
@@ -7,7 +7,7 @@
 Standards-Version: 3.6.1.0
 
 Package: libgtk2.0-0
-Section: libs
+Section: user/libs
 Architecture: any
 Depends: libgtk2.0-common (>= ${Source-Version}), libgtk2.0-bin (>= ${Source-Version}), gtk20-l10n, ${shlibs:Depends}
 Conflicts: libgtk2.0-0png3, eog2 (<< 1.0.1-4), gnome-panel2 (<< 2.0.4-1), celestia (<< 1.2.4-4), gimp1.3 (<< 1.3.7-1.1), metatheme (<< 0.9.7-3), libgnomeui-0 (<< 2.0.6-2), gtk2.0-examples (<< 2.2.0), libgdkxft0, gtk2-engines-wonderland (<= 1.0-2), gtk2-engines-cleanice (<= 1.2.8-1), gtk2-engines-thinice (<< 2.6), gtk2-engines-crux (<< 2.6), gtk2-engines-mist (<< 2.6), gtk2-engines-highcontrast (<< 2.6), gtk2-engines-lighthouseblue (<< 2.6), gnome-themes (<< 2.6), gtk2-engines-industrial (<< 0.2.32-5), gtk2-engines-pixbuf (<< 2.2.0-2.1), gtk2-engines-redmond95 (<< 2.2.0-2.1), gtk2-engines-metal (<< 2.2.0-2.1), gtk2-engines-magicchicken (<= 1.1.1-4), gtk2-engines-qtpixmap (<= 0.28-1), gtk2-engines-smooth (<< 0.5.6-3), gtk2-engines-xfce (<= 2.1.8-1), tamil-gtk2im (<= 2.2-4), imhangul (<< 0.9.9-3), librsvg2-common (<< 2.6.3-1)

Modified: projects/haf/tags/gtk+2.0/2.10.12-1~fremantle2/debian/control.in
===================================================================
--- projects/haf/tags/gtk+2.0/2.10.12-1~fremantle2/debian/control.in	2008-04-29 06:34:28 UTC (rev 15494)
+++ projects/haf/tags/gtk+2.0/2.10.12-1~fremantle2/debian/control.in	2008-04-29 06:54:02 UTC (rev 15495)
@@ -1,5 +1,5 @@
 Source: gtk+2.0
-Section: libs
+Section: user/libs
 Priority: optional
 Maintainer: Xan Lopez <xan.lopez at nokia.com>
 Build-Depends: debhelper (>> 4.0.0), gettext, pkg-config, libglib2.0-dev (>= 2.12.12-1osso9), libpango1.0-dev (>= 1.12.0), libatk1.0-dev (>= 1.9.0), libcairo2-dev (>= 1.2.0), libx11-dev, libxext-dev, libxi-dev, libxrandr-dev, libxt-dev, libxrender-dev, libxft-dev, libxcursor-dev,  libjpeg62-dev, libpng12-dev, gtk-doc-tools, libtiff4-dev, libexpat1-dev, libxfixes-dev, libtool (>= 1.5.12), libxtst-dev
@@ -7,7 +7,7 @@
 Standards-Version: 3.6.1.0
 
 Package: libgtk2.0- at SONAME@
-Section: libs
+Section: user/libs
 Architecture: any
 Depends: libgtk2.0-common (>= ${Source-Version}), libgtk2.0-bin (>= ${Source-Version}), gtk20-l10n, ${shlibs:Depends}
 Conflicts: libgtk2.0-0png3, eog2 (<< 1.0.1-4), gnome-panel2 (<< 2.0.4-1), celestia (<< 1.2.4-4), gimp1.3 (<< 1.3.7-1.1), metatheme (<< 0.9.7-3), libgnomeui-0 (<< 2.0.6-2), gtk2.0-examples (<< 2.2.0), libgdkxft0, gtk2-engines-wonderland (<= 1.0-2), gtk2-engines-cleanice (<= 1.2.8-1), gtk2-engines-thinice (<< 2.6), gtk2-engines-crux (<< 2.6), gtk2-engines-mist (<< 2.6), gtk2-engines-highcontrast (<< 2.6), gtk2-engines-lighthouseblue (<< 2.6), gnome-themes (<< 2.6), gtk2-engines-industrial (<< 0.2.32-5), gtk2-engines-pixbuf (<< 2.2.0-2.1), gtk2-engines-redmond95 (<< 2.2.0-2.1), gtk2-engines-metal (<< 2.2.0-2.1), gtk2-engines-magicchicken (<= 1.1.1-4), gtk2-engines-qtpixmap (<= 0.28-1), gtk2-engines-smooth (<< 0.5.6-3), gtk2-engines-xfce (<= 2.1.8-1), tamil-gtk2im (<= 2.2-4), imhangul (<< 0.9.9-3), librsvg2-common (<< 2.6.3-1)

Modified: projects/haf/tags/gtk+2.0/2.10.12-1~fremantle2/gtk/gtkdialog.c
===================================================================
--- projects/haf/tags/gtk+2.0/2.10.12-1~fremantle2/gtk/gtkdialog.c	2008-04-29 06:34:28 UTC (rev 15494)
+++ projects/haf/tags/gtk+2.0/2.10.12-1~fremantle2/gtk/gtkdialog.c	2008-04-29 06:54:02 UTC (rev 15495)
@@ -30,9 +30,12 @@
 #include "gtkbutton.h"
 #include "gtkdialog.h"
 #include "gtkhbbox.h"
+#include "gtkvbbox.h"
 #include "gtklabel.h"
 #include "gtkhseparator.h"
+#include "gtkvseparator.h"
 #include "gtkmarshalers.h"
+#include "gtkhbox.h"
 #include "gtkvbox.h"
 #include "gdkkeysyms.h"
 #include "gtkmain.h"
@@ -240,6 +243,9 @@
 {
   GtkDialogPrivate *priv;
 
+#ifdef MAEMO_CHANGES
+  GtkWidget *hbox = gtk_hbox_new (FALSE, 0);
+#endif /* MAEMO_CHANGES */
   priv = GET_PRIVATE (dialog);
   priv->ignore_separator = FALSE;
 
@@ -254,10 +260,18 @@
   
   dialog->vbox = gtk_vbox_new (FALSE, 0);
   
+#ifdef MAEMO_CHANGES
+  gtk_container_add (GTK_CONTAINER (dialog), hbox);
+  gtk_widget_show (hbox);
+  gtk_widget_show (dialog->vbox);
+
+  dialog->action_area = gtk_vbutton_box_new ();
+#else
   gtk_container_add (GTK_CONTAINER (dialog), dialog->vbox);
   gtk_widget_show (dialog->vbox);
 
   dialog->action_area = gtk_hbutton_box_new ();
+#endif /* MAEMO_CHANGES */
 
   gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog->action_area),
 #ifdef MAEMO_CHANGES
@@ -266,12 +280,22 @@
                              GTK_BUTTONBOX_END);  
 #endif /* MAEMO_CHANGES */
 
+#ifdef MAEMO_CHANGES
+  gtk_box_pack_end (GTK_BOX (hbox), dialog->action_area,
+                    FALSE, TRUE, 0);
+  gtk_widget_show (dialog->action_area);
+
+  dialog->separator = gtk_vseparator_new ();
+  gtk_box_pack_end (GTK_BOX (hbox), dialog->separator, FALSE, TRUE, 0);
+  gtk_box_pack_end (GTK_BOX (hbox), dialog->vbox, TRUE, TRUE, 0);
+#else
   gtk_box_pack_end (GTK_BOX (dialog->vbox), dialog->action_area,
                     FALSE, TRUE, 0);
   gtk_widget_show (dialog->action_area);
 
   dialog->separator = gtk_hseparator_new ();
   gtk_box_pack_end (GTK_BOX (dialog->vbox), dialog->separator, FALSE, TRUE, 0);
+#endif /* MAEMO_CHANGES */
   gtk_widget_show (dialog->separator);
 
   gtk_window_set_type_hint (GTK_WINDOW (dialog),
More information about the maemo-commits mailing list