From d6afa6eff295e90532f456a48c8f5533b7d51093 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 19 Jul 2009 23:46:53 -0400 Subject: [PATCH] Fix a typo in the startup-id property definition As well as some new GtkPrintOperation properties, which were not correctly set up. This was noticed in bug 588958. --- gtk/gtkprintoperation.c | 20 +++++++++++++++++--- gtk/gtkwindow.c | 6 +++--- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/gtk/gtkprintoperation.c b/gtk/gtkprintoperation.c index 765e7d0b25..4933b2fcce 100644 --- a/gtk/gtkprintoperation.c +++ b/gtk/gtkprintoperation.c @@ -70,7 +70,9 @@ enum PROP_STATUS, PROP_STATUS_STRING, PROP_CUSTOM_TAB_LABEL, - PROP_EMBED_PAGE_SETUP + PROP_EMBED_PAGE_SETUP, + PROP_HAS_SELECTION, + PROP_SUPPORT_SELECTION }; static guint signals[LAST_SIGNAL] = { 0 }; @@ -325,6 +327,12 @@ gtk_print_operation_set_property (GObject *object, case PROP_EMBED_PAGE_SETUP: gtk_print_operation_set_embed_page_setup (op, g_value_get_boolean (value)); break; + case PROP_HAS_SELECTION: + gtk_print_operation_set_has_selection (op, g_value_get_boolean (value)); + break; + case PROP_SUPPORT_SELECTION: + gtk_print_operation_set_support_selection (op, g_value_get_boolean (value)); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -387,6 +395,12 @@ gtk_print_operation_get_property (GObject *object, case PROP_EMBED_PAGE_SETUP: g_value_set_boolean (value, priv->embed_page_setup); break; + case PROP_HAS_SELECTION: + g_value_set_boolean (value, priv->has_selection); + break; + case PROP_SUPPORT_SELECTION: + g_value_set_boolean (value, priv->support_selection); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -1213,7 +1227,7 @@ gtk_print_operation_class_init (GtkPrintOperationClass *class) * Since: 2.18 */ g_object_class_install_property (gobject_class, - PROP_TRACK_PRINT_STATUS, + PROP_SUPPORT_SELECTION, g_param_spec_boolean ("support-selection", P_("Support Selection"), P_("TRUE if the print operation will support print of selection."), @@ -1230,7 +1244,7 @@ gtk_print_operation_class_init (GtkPrintOperationClass *class) * Since: 2.18 */ g_object_class_install_property (gobject_class, - PROP_TRACK_PRINT_STATUS, + PROP_HAS_SELECTION, g_param_spec_boolean ("has-selection", P_("Has Selection"), P_("TRUE if a selecion exists."), diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index 1238c2295c..de43dae7a7 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -496,7 +496,7 @@ gtk_window_class_init (GtkWindowClass *klass) P_("Unique identifier for the window to be used when restoring a session"), NULL, GTK_PARAM_READWRITE)); - + /** * GtkWindow:startup-id: * @@ -505,9 +505,9 @@ gtk_window_class_init (GtkWindowClass *klass) * for more details. * * Since: 2.12 - */ + */ g_object_class_install_property (gobject_class, - PROP_ROLE, + PROP_STARTUP_ID, g_param_spec_string ("startup-id", P_("Startup ID"), P_("Unique startup identifier for the window used by startup-notification"),