[maemo-commits] [maemo-commits] r16387 - in projects/haf/trunk/gtk+: . gtk

[From: subversion at stage.maemo.org]

Author: csaavedra
Date: 2008-10-13 16:46:43 +0300 (Mon, 13 Oct 2008)
New Revision: 16387

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtkdialog.c
Log:
2008-10-13  Claudio Saavedra  <csaavedra at igalia.com>

	Fixes NB#89865: Remove Close-like buttons from GtkDialog

	reviewed by: Tim Janik

	* gtk/gtkdialog.c: (gtk_dialog_add_button): Don't show
	Cancel/Reject/Close buttons. Patch by Alberto Garcia.



Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2008-10-13 13:06:09 UTC (rev 16386)
+++ projects/haf/trunk/gtk+/ChangeLog	2008-10-13 13:46:43 UTC (rev 16387)
@@ -1,3 +1,12 @@
+2008-10-13  Claudio Saavedra  <csaavedra at igalia.com>
+
+	Fixes NB#89865: Remove Close-like buttons from GtkDialog
+
+	reviewed by: Tim Janik
+
+	* gtk/gtkdialog.c: (gtk_dialog_add_button): Don't show
+	Cancel/Reject/Close buttons. Patch by Alberto Garcia.
+
 2008-10-09  Michael Natterer  <mitch at imendio.com>
 
 	Fixes NB#87440: Accelerator Labels not shown in menus created with

Modified: projects/haf/trunk/gtk+/gtk/gtkdialog.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkdialog.c	2008-10-13 13:06:09 UTC (rev 16386)
+++ projects/haf/trunk/gtk+/gtk/gtkdialog.c	2008-10-13 13:46:43 UTC (rev 16387)
@@ -707,7 +707,20 @@
 
   GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
   
+#ifdef MAEMO_CHANGES
+  if (response_id != GTK_RESPONSE_CANCEL &&
+      response_id != GTK_RESPONSE_REJECT &&
+      response_id != GTK_RESPONSE_CLOSE)
+    {
+      gtk_widget_show (button);
+    }
+    else
+    {
+      gtk_widget_set_no_show_all (button, TRUE);
+    }
+#else
   gtk_widget_show (button);
+#endif /* MAEMO_CHANGES */
   
   gtk_dialog_add_action_widget (dialog,
                                 button,