[gtk+/gtk-2-18] Revert "let the close button reflect the page_complete status of SUMMARY pages"
- From: Sven Herzberg <herzi src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gtk+/gtk-2-18] Revert "let the close button reflect the page_complete status of SUMMARY pages"
- Date: Thu, 10 Dec 2009 21:08:40 +0000 (UTC)
commit 19a95139fff369d23785962d022c5925765fa838
Author: Sven Herzberg <herzi gnome-de org>
Date: Thu Dec 10 22:08:30 2009 +0100
Revert "let the close button reflect the page_complete status of SUMMARY pages"
This reverts commit da3b33f1a8e60e3239ba2e7f20046836ffb3ffde.
This was accidentally commited and intended for master only.
gtk/gtkassistant.c | 15 ++-------------
gtk/tests/treeview.c | 2 +-
tests/testassistant.c | 14 ++------------
3 files changed, 5 insertions(+), 26 deletions(-)
---
diff --git a/gtk/gtkassistant.c b/gtk/gtkassistant.c
index 452d0b4..a2e2f7a 100644
--- a/gtk/gtkassistant.c
+++ b/gtk/gtkassistant.c
@@ -55,8 +55,7 @@ struct _GtkAssistantPage
{
GtkWidget *page;
GtkAssistantPageType type;
- guint complete : 1;
- guint complete_set : 1;
+ gboolean complete;
GtkWidget *title;
GdkPixbuf *header_image;
@@ -137,8 +136,6 @@ static void gtk_assistant_buildable_custom_finished (GtkBuildable *bui
const gchar *tagname,
gpointer user_data);
-static GList* find_page (GtkAssistant *assistant,
- GtkWidget *page);
enum
{
@@ -519,7 +516,7 @@ set_assistant_buttons_state (GtkAssistant *assistant)
compute_last_button_state (assistant);
break;
case GTK_ASSISTANT_PAGE_SUMMARY:
- gtk_widget_set_sensitive (assistant->close, priv->current_page->complete);
+ gtk_widget_set_sensitive (assistant->close, TRUE);
gtk_widget_grab_default (assistant->close);
gtk_widget_show (assistant->close);
gtk_widget_hide (assistant->cancel);
@@ -1931,13 +1928,6 @@ gtk_assistant_set_page_type (GtkAssistant *assistant,
{
page_info->type = type;
- /* backwards compatibility to the era before fixing bug 604289 */
- if (type == GTK_ASSISTANT_PAGE_SUMMARY && !page_info->complete_set)
- {
- gtk_assistant_set_page_complete (assistant, page, TRUE);
- page_info->complete_set = FALSE;
- }
-
/* Always set buttons state, a change in a future page
might change current page buttons */
set_assistant_buttons_state (assistant);
@@ -2169,7 +2159,6 @@ gtk_assistant_set_page_complete (GtkAssistant *assistant,
if (complete != page_info->complete)
{
page_info->complete = complete;
- page_info->complete_set = TRUE;
/* Always set buttons state, a change in a future page
might change current page buttons */
diff --git a/gtk/tests/treeview.c b/gtk/tests/treeview.c
index 1b3ce99..3dcc442 100644
--- a/gtk/tests/treeview.c
+++ b/gtk/tests/treeview.c
@@ -57,7 +57,7 @@ test_bug_546005 (void)
NULL, FALSE);
gtk_tree_view_get_cursor (GTK_TREE_VIEW (view), &cursor_path, NULL);
- //gtk_assert_cmptreepath (cursor_path, ==, path);
+ g_assert (gtk_tree_path_compare (cursor_path, path) == 0);
gtk_tree_path_free (path);
gtk_tree_path_free (cursor_path);
diff --git a/tests/testassistant.c b/tests/testassistant.c
index 91774e3..3eff2cd 100644
--- a/tests/testassistant.c
+++ b/tests/testassistant.c
@@ -213,7 +213,6 @@ create_generous_assistant (GtkWidget *widget)
if (!assistant)
{
GtkWidget *page, *next, *check;
- PageData *pdata;
assistant = gtk_assistant_new ();
gtk_window_set_default_size (GTK_WINDOW (assistant), 400, 300);
@@ -260,21 +259,12 @@ create_generous_assistant (GtkWidget *widget)
gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), page, "Progress");
gtk_assistant_set_page_type (GTK_ASSISTANT (assistant), page, GTK_ASSISTANT_PAGE_PROGRESS);
- page = gtk_check_button_new_with_label ("Summary complete");
+ page = get_test_page ("Summary");
gtk_widget_show (page);
gtk_assistant_append_page (GTK_ASSISTANT (assistant), page);
gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), page, "Summary");
gtk_assistant_set_page_type (GTK_ASSISTANT (assistant), page, GTK_ASSISTANT_PAGE_SUMMARY);
-
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (page),
- gtk_assistant_get_page_complete (GTK_ASSISTANT (assistant),
- page));
-
- pdata = g_new (PageData, 1);
- pdata->assistant = GTK_ASSISTANT (assistant);
- pdata->page = page;
- g_signal_connect (page, "toggled",
- G_CALLBACK (complete_cb), pdata);
+ gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), page, TRUE);
}
if (!GTK_WIDGET_VISIBLE (assistant))
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]