[maemo-commits] [maemo-commits] r9711 - in projects/haf/branches/gtk+/maemo-gtk-2-10: . gtk

[From: subversion at stage.maemo.org]

Author: kris
Date: 2007-02-07 15:48:55 +0200 (Wed, 07 Feb 2007)
New Revision: 9711

Modified:
   projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
   projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkdialog.c
Log:
2007-02-07  Kristian Rietveld  <kris at imendio.com>

	* gtk/gtkdialog.c: revert last change, since it will be replaced
	by an upstream feature.



Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-02-07 12:37:53 UTC (rev 9710)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-02-07 13:48:55 UTC (rev 9711)
@@ -1,5 +1,10 @@
 2007-02-07  Kristian Rietveld  <kris at imendio.com>
 
+	* gtk/gtkdialog.c: revert last change, since it will be replaced
+	by an upstream feature.
+
+2007-02-07  Kristian Rietveld  <kris at imendio.com>
+
 	* gtk/gtkdialog.c (gtk_dialog_init): pack an alignment in the vbox,
 	and the action_area in the alignment to get the buttons centered.
 

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkdialog.c
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkdialog.c	2007-02-07 12:37:53 UTC (rev 9710)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkdialog.c	2007-02-07 13:48:55 UTC (rev 9711)
@@ -39,10 +39,6 @@
 #include "gtkprivate.h"
 #include "gtkalias.h"
 
-#ifdef MAEMO_CHANGES
-#include "gtkalignment.h"
-#endif /* MAEMO_CHANGES */
-
 #define GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_DIALOG, GtkDialogPrivate))
 
 typedef struct {
@@ -203,9 +199,6 @@
 gtk_dialog_init (GtkDialog *dialog)
 {
   GtkDialogPrivate *priv;
-#ifdef MAEMO_CHANGES
-  GtkWidget *alignment;
-#endif /* MAEMO_CHANGES */
 
   priv = GET_PRIVATE (dialog);
   priv->ignore_separator = FALSE;
@@ -224,28 +217,14 @@
   gtk_container_add (GTK_CONTAINER (dialog), dialog->vbox);
   gtk_widget_show (dialog->vbox);
 
-#ifdef MAEMO_CHANGES
-  /* Add an alignment to the vbox to center the dialog buttons */
-  alignment = gtk_alignment_new (0.5, 0.5, 0, 0);
-  gtk_box_pack_end (GTK_BOX (dialog->vbox), alignment, FALSE, TRUE, 0);
-#endif /* MAEMO_CHANGES */
-
   dialog->action_area = gtk_hbutton_box_new ();
 
   gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog->action_area),
                              GTK_BUTTONBOX_END);  
 
-#ifdef MAEMO_CHANGES
-  gtk_container_add (GTK_CONTAINER (alignment), dialog->action_area);
-#else /* !MAEMO_CHANGES */
   gtk_box_pack_end (GTK_BOX (dialog->vbox), dialog->action_area,
                     FALSE, TRUE, 0);
-#endif /* !MAEMO_CHANGES */
-
   gtk_widget_show (dialog->action_area);
-#ifdef MAEMO_CHANGES
-  gtk_widget_show (alignment);
-#endif /* MAEMO_CHANGES */
 
   dialog->separator = gtk_hseparator_new ();
   gtk_box_pack_end (GTK_BOX (dialog->vbox), dialog->separator, FALSE, TRUE, 0);