diff options
87 files changed, 465 insertions, 443 deletions
@@ -1,3 +1,9 @@ +2005-03-26 Matthias Clasen <mclasen@redhat.com> + + * gtk/*.c: + * gdk/gdkdisplaymanager.c: + Use canonical names for g_object_notify() as well. + 2005-03-24 Tor Lillqvist <tml@novell.com> * configure.in (GTK_EXTRA_CFLAGS): Include the -mms-bitfields flag diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 32b0cf70f2..bbd2c8ecff 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2005-03-26 Matthias Clasen <mclasen@redhat.com> + + * gtk/*.c: + * gdk/gdkdisplaymanager.c: + Use canonical names for g_object_notify() as well. + 2005-03-24 Tor Lillqvist <tml@novell.com> * configure.in (GTK_EXTRA_CFLAGS): Include the -mms-bitfields flag diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 32b0cf70f2..bbd2c8ecff 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2005-03-26 Matthias Clasen <mclasen@redhat.com> + + * gtk/*.c: + * gdk/gdkdisplaymanager.c: + Use canonical names for g_object_notify() as well. + 2005-03-24 Tor Lillqvist <tml@novell.com> * configure.in (GTK_EXTRA_CFLAGS): Include the -mms-bitfields flag diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index 8fa0f71119..9830f95f9b 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,3 +1,8 @@ +2005-03-25 Matthias Clasen <mclasen@redhat.com> + + * gdk-pixbuf-data.c (gdk_pixbuf_new_from_data): Use canonical + property names. + 2005-03-21 Matthias Clasen <mclasen@redhat.com> * gdk-pixbuf.c (gdk_pixbuf_class_init): Mark param spec strings diff --git a/gdk-pixbuf/gdk-pixbuf-data.c b/gdk-pixbuf/gdk-pixbuf-data.c index 1fcf87b84e..43fd9c1d3d 100644 --- a/gdk-pixbuf/gdk-pixbuf-data.c +++ b/gdk-pixbuf/gdk-pixbuf-data.c @@ -64,9 +64,9 @@ gdk_pixbuf_new_from_data (const guchar *data, GdkColorspace colorspace, gboolean pixbuf = g_object_new (GDK_TYPE_PIXBUF, "colorspace", colorspace, - "n_channels", has_alpha ? 4 : 3, - "bits_per_sample", bits_per_sample, - "has_alpha", has_alpha ? TRUE : FALSE, + "n-channels", has_alpha ? 4 : 3, + "bits-per-sample", bits_per_sample, + "has-alpha", has_alpha ? TRUE : FALSE, "width", width, "height", height, "rowstride", rowstride, diff --git a/gdk/gdkdisplaymanager.c b/gdk/gdkdisplaymanager.c index 897d99ba5d..157bcf42c4 100644 --- a/gdk/gdkdisplaymanager.c +++ b/gdk/gdkdisplaymanager.c @@ -260,7 +260,7 @@ gdk_display_manager_set_default_display (GdkDisplayManager *display_manager, _gdk_windowing_set_default_display (display); - g_object_notify (G_OBJECT (display_manager), "default_display"); + g_object_notify (G_OBJECT (display_manager), "default-display"); } /** diff --git a/gtk/gtkaboutdialog.c b/gtk/gtkaboutdialog.c index fcecc485c4..6c4e75bca1 100644 --- a/gtk/gtkaboutdialog.c +++ b/gtk/gtkaboutdialog.c @@ -1147,7 +1147,7 @@ gtk_about_dialog_set_website_label (GtkAboutDialog *about, } g_free (tmp); - g_object_notify (G_OBJECT (about), "website_label"); + g_object_notify (G_OBJECT (about), "website-label"); } /** @@ -1455,7 +1455,7 @@ gtk_about_dialog_set_logo (GtkAboutDialog *about, g_object_freeze_notify (G_OBJECT (about)); if (gtk_image_get_storage_type (GTK_IMAGE (priv->logo_image)) == GTK_IMAGE_ICON_NAME) - g_object_notify (G_OBJECT (about), "logo_icon_name"); + g_object_notify (G_OBJECT (about), "logo-icon-name"); if (logo != NULL) gtk_image_set_from_pixbuf (GTK_IMAGE (priv->logo_image), logo); @@ -1537,7 +1537,7 @@ gtk_about_dialog_set_logo_icon_name (GtkAboutDialog *about, gtk_image_set_from_icon_name (GTK_IMAGE (priv->logo_image), icon_name, GTK_ICON_SIZE_DIALOG); - g_object_notify (G_OBJECT (about), "logo_icon_name"); + g_object_notify (G_OBJECT (about), "logo-icon-name"); g_object_thaw_notify (G_OBJECT (about)); } diff --git a/gtk/gtkaccellabel.c b/gtk/gtkaccellabel.c index a78e812905..c60f308cd9 100644 --- a/gtk/gtkaccellabel.c +++ b/gtk/gtkaccellabel.c @@ -433,7 +433,7 @@ gtk_accel_label_set_accel_widget (GtkAccelLabel *accel_label, accel_label, G_CONNECT_SWAPPED); refetch_widget_accel_closure (accel_label); } - g_object_notify (G_OBJECT (accel_label), "accel_widget"); + g_object_notify (G_OBJECT (accel_label), "accel-widget"); } } @@ -496,7 +496,7 @@ gtk_accel_label_set_accel_closure (GtkAccelLabel *accel_label, accel_label, 0); } gtk_accel_label_reset (accel_label); - g_object_notify (G_OBJECT (accel_label), "accel_closure"); + g_object_notify (G_OBJECT (accel_label), "accel-closure"); } } diff --git a/gtk/gtkaction.c b/gtk/gtkaction.c index 5250b7cc9c..a664f6e972 100644 --- a/gtk/gtkaction.c +++ b/gtk/gtkaction.c @@ -447,7 +447,7 @@ gtk_action_set_property (GObject *object, tmp = action->private_data->short_label; action->private_data->short_label = g_strdup (action->private_data->label); g_free (tmp); - g_object_notify (object, "short_label"); + g_object_notify (object, "short-label"); } break; case PROP_SHORT_LABEL: @@ -487,7 +487,7 @@ gtk_action_set_property (GObject *object, tmp = action->private_data->short_label; action->private_data->short_label = g_strdup (action->private_data->label); g_free (tmp); - g_object_notify (object, "short_label"); + g_object_notify (object, "short-label"); } break; case PROP_VISIBLE_HORIZONTAL: @@ -716,7 +716,7 @@ gtk_action_sync_short_label (GtkAction *action, GValue value = { 0, }; g_value_init (&value, G_TYPE_STRING); - g_object_get_property (G_OBJECT (action), "short_label", &value); + g_object_get_property (G_OBJECT (action), "short-label", &value); g_object_set_property (G_OBJECT (proxy), "label", &value); g_value_unset (&value); diff --git a/gtk/gtkactiongroup.c b/gtk/gtkactiongroup.c index 6f55c27326..41f4e25909 100644 --- a/gtk/gtkactiongroup.c +++ b/gtk/gtkactiongroup.c @@ -251,7 +251,7 @@ gtk_action_group_class_init (GtkActionGroupClass *klass) static void remove_action (GtkAction *action) { - g_object_set (action, "action_group", NULL, NULL); + g_object_set (action, "action-group", NULL, NULL); g_object_unref (action); } @@ -546,7 +546,7 @@ gtk_action_group_add_action (GtkActionGroup *action_group, g_hash_table_insert (action_group->private_data->actions, g_strdup (gtk_action_get_name (action)), g_object_ref (action)); - g_object_set (action, "action_group", action_group, NULL); + g_object_set (action, "action-group", action_group, NULL); } /** @@ -579,7 +579,7 @@ gtk_action_group_add_action_with_accel (GtkActionGroup *action_group, gchar *name; gchar *stock_id; - g_object_get (action, "name", &name, "stock_id", &stock_id, NULL); + g_object_get (action, "name", &name, "stock-id", &stock_id, NULL); accel_path = g_strconcat ("<Actions>/", action_group->private_data->name, "/", name, NULL); diff --git a/gtk/gtkadjustment.c b/gtk/gtkadjustment.c index c547e38bdc..70b43b35c9 100644 --- a/gtk/gtkadjustment.c +++ b/gtk/gtkadjustment.c @@ -339,7 +339,7 @@ gtk_adjustment_new (gdouble value, "upper", upper, "step-increment", step_increment, "page-increment", page_increment, - "page_size", page_size, + "page-size", page_size, "value", value, NULL); } diff --git a/gtk/gtkalignment.c b/gtk/gtkalignment.c index 94eea7b0c2..2b8f692f25 100644 --- a/gtk/gtkalignment.c +++ b/gtk/gtkalignment.c @@ -559,22 +559,22 @@ gtk_alignment_set_padding (GtkAlignment *alignment, if (priv->padding_top != padding_top) { priv->padding_top = padding_top; - g_object_notify (G_OBJECT (alignment), "top_padding"); + g_object_notify (G_OBJECT (alignment), "top-padding"); } if (priv->padding_bottom != padding_bottom) { priv->padding_bottom = padding_bottom; - g_object_notify (G_OBJECT (alignment), "bottom_padding"); + g_object_notify (G_OBJECT (alignment), "bottom-padding"); } if (priv->padding_left != padding_left) { priv->padding_left = padding_left; - g_object_notify (G_OBJECT (alignment), "left_padding"); + g_object_notify (G_OBJECT (alignment), "left-padding"); } if (priv->padding_right != padding_right) { priv->padding_right = padding_right; - g_object_notify (G_OBJECT (alignment), "right_padding"); + g_object_notify (G_OBJECT (alignment), "right-padding"); } g_object_thaw_notify (G_OBJECT (alignment)); diff --git a/gtk/gtkarrow.c b/gtk/gtkarrow.c index 7494f82ff8..f9568e481f 100644 --- a/gtk/gtkarrow.c +++ b/gtk/gtkarrow.c @@ -208,13 +208,13 @@ gtk_arrow_set (GtkArrow *arrow, if ((GtkArrowType) arrow->arrow_type != arrow_type) { arrow->arrow_type = arrow_type; - g_object_notify (G_OBJECT (arrow), "arrow_type"); + g_object_notify (G_OBJECT (arrow), "arrow-type"); } if ((GtkShadowType) arrow->shadow_type != shadow_type) { arrow->shadow_type = shadow_type; - g_object_notify (G_OBJECT (arrow), "shadow_type"); + g_object_notify (G_OBJECT (arrow), "shadow-type"); } g_object_thaw_notify (G_OBJECT (arrow)); diff --git a/gtk/gtkaspectframe.c b/gtk/gtkaspectframe.c index 52685354ab..3353257704 100644 --- a/gtk/gtkaspectframe.c +++ b/gtk/gtkaspectframe.c @@ -277,7 +277,7 @@ gtk_aspect_frame_set (GtkAspectFrame *aspect_frame, if (aspect_frame->obey_child != obey_child) { aspect_frame->obey_child = obey_child; - g_object_notify (G_OBJECT (aspect_frame), "obey_child"); + g_object_notify (G_OBJECT (aspect_frame), "obey-child"); } g_object_thaw_notify (G_OBJECT (aspect_frame)); diff --git a/gtk/gtkbbox.c b/gtk/gtkbbox.c index e8197c45c1..7ced719f38 100644 --- a/gtk/gtkbbox.c +++ b/gtk/gtkbbox.c @@ -287,7 +287,7 @@ gtk_button_box_set_layout (GtkButtonBox *widget, if (widget->layout_style != layout_style) { widget->layout_style = layout_style; - g_object_notify (G_OBJECT (widget), "layout_style"); + g_object_notify (G_OBJECT (widget), "layout-style"); gtk_widget_queue_resize (GTK_WIDGET (widget)); } } @@ -449,14 +449,11 @@ _gtk_button_box_child_requisition (GtkWidget *widget, bbox = GTK_BUTTON_BOX (widget); gtk_widget_style_get (widget, - "child_min_width", - &width_default, - "child_min_height", - &height_default, - "child_internal_pad_x", - &ipad_x_default, - "child_internal_pad_y", - &ipad_y_default, NULL); + "child-min-width", &width_default, + "child-min-height", &height_default, + "child-internal-pad-x", &ipad_x_default, + "child-internal-pad-y", &ipad_y_default, + NULL); child_min_width = bbox->child_min_width != GTK_BUTTONBOX_DEFAULT ? bbox->child_min_width : width_default; diff --git a/gtk/gtkbox.c b/gtk/gtkbox.c index 251572f8ac..8d3acc0824 100644 --- a/gtk/gtkbox.c +++ b/gtk/gtkbox.c @@ -392,7 +392,7 @@ gtk_box_pack_start (GtkBox *box, gtk_widget_child_notify (child, "expand"); gtk_widget_child_notify (child, "fill"); gtk_widget_child_notify (child, "padding"); - gtk_widget_child_notify (child, "pack_type"); + gtk_widget_child_notify (child, "pack-type"); gtk_widget_child_notify (child, "position"); gtk_widget_thaw_child_notify (child); } @@ -427,7 +427,7 @@ gtk_box_pack_end (GtkBox *box, gtk_widget_child_notify (child, "expand"); gtk_widget_child_notify (child, "fill"); gtk_widget_child_notify (child, "padding"); - gtk_widget_child_notify (child, "pack_type"); + gtk_widget_child_notify (child, "pack-type"); gtk_widget_child_notify (child, "position"); gtk_widget_thaw_child_notify (child); } @@ -625,7 +625,7 @@ gtk_box_set_child_packing (GtkBox *box, child_info->pack = GTK_PACK_END; else child_info->pack = GTK_PACK_START; - gtk_widget_child_notify (child, "pack_type"); + gtk_widget_child_notify (child, "pack-type"); if (GTK_WIDGET_VISIBLE (child) && GTK_WIDGET_VISIBLE (box)) gtk_widget_queue_resize (child); diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c index 1980c51557..d9eedf18b5 100644 --- a/gtk/gtkbutton.c +++ b/gtk/gtkbutton.c @@ -673,7 +673,7 @@ gtk_button_construct_child (GtkButton *button) g_object_set (priv->image, "visible", show_image (button), - "no_show_all", TRUE, + "no-show-all", TRUE, NULL); hbox = gtk_hbox_new (FALSE, 2); @@ -734,8 +734,8 @@ gtk_button_new_from_stock (const gchar *stock_id) { return g_object_new (GTK_TYPE_BUTTON, "label", stock_id, - "use_stock", TRUE, - "use_underline", TRUE, + "use-stock", TRUE, + "use-underline", TRUE, NULL); } @@ -755,7 +755,7 @@ gtk_button_new_from_stock (const gchar *stock_id) GtkWidget* gtk_button_new_with_mnemonic (const gchar *label) { - return g_object_new (GTK_TYPE_BUTTON, "label", label, "use_underline", TRUE, NULL); + return g_object_new (GTK_TYPE_BUTTON, "label", label, "use-underline", TRUE, NULL); } void @@ -909,7 +909,7 @@ gtk_button_get_props (GtkButton *button, if (default_border) { - gtk_widget_style_get (widget, "default_border", &tmp_border, NULL); + gtk_widget_style_get (widget, "default-border", &tmp_border, NULL); if (tmp_border) { @@ -922,7 +922,7 @@ gtk_button_get_props (GtkButton *button, if (default_outside_border) { - gtk_widget_style_get (widget, "default_outside_border", &tmp_border, NULL); + gtk_widget_style_get (widget, "default-outside-border", &tmp_border, NULL); if (tmp_border) { @@ -934,7 +934,7 @@ gtk_button_get_props (GtkButton *button, } if (interior_focus) - gtk_widget_style_get (widget, "interior_focus", interior_focus, NULL); + gtk_widget_style_get (widget, "interior-focus", interior_focus, NULL); } static void @@ -1039,8 +1039,8 @@ gtk_button_size_allocate (GtkWidget *widget, gint child_displacement_y; gtk_widget_style_get (widget, - "child_displacement_x", &child_displacement_x, - "child_displacement_y", &child_displacement_y, + "child-displacement-x", &child_displacement_x, + "child-displacement-y", &child_displacement_y, NULL); child_allocation.x += child_displacement_x; child_allocation.y += child_displacement_y; @@ -1127,9 +1127,9 @@ _gtk_button_paint (GtkButton *button, gboolean displace_focus; gtk_widget_style_get (GTK_WIDGET (widget), - "child_displacement_y", &child_displacement_y, - "child_displacement_x", &child_displacement_x, - "displace_focus", &displace_focus, + "child-displacement-y", &child_displacement_y, + "child-displacement-x", &child_displacement_x, + "displace-focus", &displace_focus, NULL); if (interior_focus) @@ -1425,7 +1425,7 @@ gtk_button_set_use_underline (GtkButton *button, gtk_button_construct_child (button); - g_object_notify (G_OBJECT (button), "use_underline"); + g_object_notify (G_OBJECT (button), "use-underline"); } } @@ -1469,7 +1469,7 @@ gtk_button_set_use_stock (GtkButton *button, gtk_button_construct_child (button); - g_object_notify (G_OBJECT (button), "use_stock"); + g_object_notify (G_OBJECT (button), "use-stock"); } } @@ -1515,7 +1515,7 @@ gtk_button_set_focus_on_click (GtkButton *button, { button->focus_on_click = focus_on_click; - g_object_notify (G_OBJECT (button), "focus_on_click"); + g_object_notify (G_OBJECT (button), "focus-on-click"); } } diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c index a96817eb23..585fa85c4a 100644 --- a/gtk/gtkcalendar.c +++ b/gtk/gtkcalendar.c @@ -2447,13 +2447,13 @@ gtk_calendar_set_display_options (GtkCalendar *calendar, g_object_freeze_notify (G_OBJECT (calendar)); if ((old_flags ^ calendar->display_flags) & GTK_CALENDAR_SHOW_HEADING) - g_object_notify (G_OBJECT (calendar), "show_heading"); + g_object_notify (G_OBJECT (calendar), "show-heading"); if ((old_flags ^ calendar->display_flags) & GTK_CALENDAR_SHOW_DAY_NAMES) - g_object_notify (G_OBJECT (calendar), "show_day_names"); + g_object_notify (G_OBJECT (calendar), "show-day-names"); if ((old_flags ^ calendar->display_flags) & GTK_CALENDAR_NO_MONTH_CHANGE) - g_object_notify (G_OBJECT (calendar), "no_month_change"); + g_object_notify (G_OBJECT (calendar), "no-month-change"); if ((old_flags ^ calendar->display_flags) & GTK_CALENDAR_SHOW_WEEK_NUMBERS) - g_object_notify (G_OBJECT (calendar), "show_week_numbers"); + g_object_notify (G_OBJECT (calendar), "show-week-numbers"); g_object_thaw_notify (G_OBJECT (calendar)); } diff --git a/gtk/gtkcellrenderer.c b/gtk/gtkcellrenderer.c index 5e6477be6a..8c6a8df773 100644 --- a/gtk/gtkcellrenderer.c +++ b/gtk/gtkcellrenderer.c @@ -447,7 +447,7 @@ gtk_cell_renderer_set_property (GObject *object, else g_warning ("Don't know color `%s'", g_value_get_string (value)); - g_object_notify (object, "cell_background_gdk"); + g_object_notify (object, "cell-background-gdk"); } break; case PROP_CELL_BACKGROUND_GDK: @@ -473,7 +473,7 @@ set_cell_bg_color (GtkCellRenderer *cell, if (!cell->cell_background_set) { cell->cell_background_set = TRUE; - g_object_notify (G_OBJECT (cell), "cell_background_set"); + g_object_notify (G_OBJECT (cell), "cell-background-set"); } priv->cell_background.red = color->red; @@ -485,7 +485,7 @@ set_cell_bg_color (GtkCellRenderer *cell, if (cell->cell_background_set) { cell->cell_background_set = FALSE; - g_object_notify (G_OBJECT (cell), "cell_background_set"); + g_object_notify (G_OBJECT (cell), "cell-background-set"); } } } diff --git a/gtk/gtkcellrenderercombo.c b/gtk/gtkcellrenderercombo.c index 35dcbc79d4..6bc871f536 100644 --- a/gtk/gtkcellrenderercombo.c +++ b/gtk/gtkcellrenderercombo.c @@ -376,7 +376,7 @@ gtk_cell_renderer_combo_start_editing (GtkCellRenderer *cell, &(search_data.iter)); } - g_object_set (combo, "has_frame", FALSE, NULL); + g_object_set (combo, "has-frame", FALSE, NULL); g_object_set_data_full (G_OBJECT (combo), GTK_CELL_RENDERER_COMBO_PATH, g_strdup (path), g_free); diff --git a/gtk/gtkcellrenderertext.c b/gtk/gtkcellrenderertext.c index 7c401bd60b..f7d93b519e 100644 --- a/gtk/gtkcellrenderertext.c +++ b/gtk/gtkcellrenderertext.c @@ -821,7 +821,7 @@ set_bg_color (GtkCellRendererText *celltext, if (!celltext->background_set) { celltext->background_set = TRUE; - g_object_notify (G_OBJECT (celltext), "background_set"); + g_object_notify (G_OBJECT (celltext), "background-set"); } celltext->background.red = color->red; @@ -833,7 +833,7 @@ set_bg_color (GtkCellRendererText *celltext, if (celltext->background_set) { celltext->background_set = FALSE; - g_object_notify (G_OBJECT (celltext), "background_set"); + g_object_notify (G_OBJECT (celltext), "background-set"); } } } @@ -848,7 +848,7 @@ set_fg_color (GtkCellRendererText *celltext, if (!celltext->foreground_set) { celltext->foreground_set = TRUE; - g_object_notify (G_OBJECT (celltext), "foreground_set"); + g_object_notify (G_OBJECT (celltext), "foreground-set"); } celltext->foreground.red = color->red; @@ -860,7 +860,7 @@ set_fg_color (GtkCellRendererText *celltext, if (celltext->foreground_set) { celltext->foreground_set = FALSE; - g_object_notify (G_OBJECT (celltext), "foreground_set"); + g_object_notify (G_OBJECT (celltext), "foreground-set"); } } } @@ -910,17 +910,17 @@ notify_set_changed (GObject *object, PangoFontMask changed_mask) { if (changed_mask & PANGO_FONT_MASK_FAMILY) - g_object_notify (object, "family_set"); + g_object_notify (object, "family-set"); if (changed_mask & PANGO_FONT_MASK_STYLE) - g_object_notify (object, "style_set"); + g_object_notify (object, "style-set"); if (changed_mask & PANGO_FONT_MASK_VARIANT) - g_object_notify (object, "variant_set"); + g_object_notify (object, "variant-set"); if (changed_mask & PANGO_FONT_MASK_WEIGHT) - g_object_notify (object, "weight_set"); + g_object_notify (object, "weight-set"); if (changed_mask & PANGO_FONT_MASK_STRETCH) - g_object_notify (object, "stretch_set"); + g_object_notify (object, "stretch-set"); if (changed_mask & PANGO_FONT_MASK_SIZE) - g_object_notify (object, "size_set"); + g_object_notify (object, "size-set"); } static void @@ -965,7 +965,7 @@ set_font_description (GtkCellRendererText *celltext, g_object_freeze_notify (object); - g_object_notify (object, "font_desc"); + g_object_notify (object, "font-desc"); g_object_notify (object, "font"); if (changed_mask & PANGO_FONT_MASK_FAMILY) @@ -981,7 +981,7 @@ set_font_description (GtkCellRendererText *celltext, if (changed_mask & PANGO_FONT_MASK_SIZE) { g_object_notify (object, "size"); - g_object_notify (object, "size_points"); + g_object_notify (object, "size-points"); } notify_set_changed (object, set_changed_mask); @@ -1075,7 +1075,7 @@ gtk_cell_renderer_text_set_property (GObject *object, else g_warning ("Don't know color `%s'", g_value_get_string (value)); - g_object_notify (object, "background_gdk"); + g_object_notify (object, "background-gdk"); } break; @@ -1090,7 +1090,7 @@ gtk_cell_renderer_text_set_property (GObject *object, else g_warning ("Don't know color `%s'", g_value_get_string (value)); - g_object_notify (object, "foreground_gdk"); + g_object_notify (object, "foreground-gdk"); } break; @@ -1165,7 +1165,7 @@ gtk_cell_renderer_text_set_property (GObject *object, case PROP_SIZE: pango_font_description_set_size (celltext->font, g_value_get_int (value)); - g_object_notify (object, "size_points"); + g_object_notify (object, "size-points"); break; case PROP_SIZE_POINTS: pango_font_description_set_size (celltext->font, @@ -1178,7 +1178,7 @@ gtk_cell_renderer_text_set_property (GObject *object, celltext->calc_fixed_height = TRUE; notify_set_changed (object, old_set_mask & pango_font_description_get_set_fields (celltext->font)); - g_object_notify (object, "font_desc"); + g_object_notify (object, "font-desc"); g_object_notify (object, "font"); break; @@ -1189,7 +1189,7 @@ gtk_cell_renderer_text_set_property (GObject *object, celltext->scale_set = TRUE; if (celltext->fixed_height_rows != -1) celltext->calc_fixed_height = TRUE; - g_object_notify (object, "scale_set"); + g_object_notify (object, "scale-set"); break; case PROP_EDITABLE: @@ -1199,26 +1199,26 @@ gtk_cell_renderer_text_set_property (GObject *object, GTK_CELL_RENDERER (celltext)->mode = GTK_CELL_RENDERER_MODE_EDITABLE; else GTK_CELL_RENDERER (celltext)->mode = GTK_CELL_RENDERER_MODE_INERT; - g_object_notify (object, "editable_set"); + g_object_notify (object, "editable-set"); break; case PROP_STRIKETHROUGH: celltext->strikethrough = g_value_get_boolean (value); celltext->strikethrough_set = TRUE; - g_object_notify (object, "strikethrough_set"); + g_object_notify (object, "strikethrough-set"); break; case PROP_UNDERLINE: celltext->underline_style = g_value_get_enum (value); celltext->underline_set = TRUE; - g_object_notify (object, "underline_set"); + g_object_notify (object, "underline-set"); break; case PROP_RISE: celltext->rise = g_value_get_int (value); celltext->rise_set = TRUE; - g_object_notify (object, "rise_set"); + g_object_notify (object, "rise-set"); if (celltext->fixed_height_rows != -1) celltext->calc_fixed_height = TRUE; break; @@ -1228,13 +1228,13 @@ gtk_cell_renderer_text_set_property (GObject *object, if (priv->language) g_object_unref (priv->language); priv->language = pango_language_from_string (g_value_get_string (value)); - g_object_notify (object, "language_set"); + g_object_notify (object, "language-set"); break; case PROP_ELLIPSIZE: priv->ellipsize = g_value_get_enum (value); priv->ellipsize_set = TRUE; - g_object_notify (object, "ellipsize_set"); + g_object_notify (object, "ellipsize-set"); break; case PROP_WRAP_MODE: @@ -1808,7 +1808,7 @@ gtk_cell_renderer_text_start_editing (GtkCellRenderer *cell, return NULL; priv->entry = g_object_new (GTK_TYPE_ENTRY, - "has_frame", FALSE, + "has-frame", FALSE, "xalign", cell->xalign, NULL); diff --git a/gtk/gtkcellview.c b/gtk/gtkcellview.c index efdda51009..075c24e235 100644 --- a/gtk/gtkcellview.c +++ b/gtk/gtkcellview.c @@ -262,7 +262,7 @@ gtk_cell_view_set_property (GObject *object, else g_warning ("Don't know color `%s'", g_value_get_string (value)); - g_object_notify (object, "background_gdk"); + g_object_notify (object, "background-gdk"); } break; case PROP_BACKGROUND_GDK: @@ -1051,7 +1051,7 @@ gtk_cell_view_set_background_color (GtkCellView *cell_view, if (!cell_view->priv->background_set) { cell_view->priv->background_set = TRUE; - g_object_notify (G_OBJECT (cell_view), "background_set"); + g_object_notify (G_OBJECT (cell_view), "background-set"); } cell_view->priv->background = *color; @@ -1061,7 +1061,7 @@ gtk_cell_view_set_background_color (GtkCellView *cell_view, if (cell_view->priv->background_set) { cell_view->priv->background_set = FALSE; - g_object_notify (G_OBJECT (cell_view), "background_set"); + g_object_notify (G_OBJECT (cell_view), "background-set"); } } diff --git a/gtk/gtkcheckbutton.c b/gtk/gtkcheckbutton.c index c0d767e222..945001e7bb 100644 --- a/gtk/gtkcheckbutton.c +++ b/gtk/gtkcheckbutton.c @@ -208,10 +208,10 @@ _gtk_check_button_get_props (GtkCheckButton *check_button, GtkWidget *widget = GTK_WIDGET (check_button); if (indicator_size) - gtk_widget_style_get (widget, "indicator_size", indicator_size, NULL); + gtk_widget_style_get (widget, "indicator-size", indicator_size, NULL); if (indicator_spacing) - gtk_widget_style_get (widget, "indicator_spacing", indicator_spacing, NULL); + gtk_widget_style_get (widget, "indicator-spacing", indicator_spacing, NULL); } static void @@ -394,9 +394,11 @@ gtk_real_check_button_draw_indicator (GtkCheckButton *check_button, button = GTK_BUTTON (check_button); toggle_button = GTK_TOGGLE_BUTTON (check_button); - gtk_widget_style_get (widget, "interior_focus", &interior_focus, + gtk_widget_style_get (widget, + "interior-focus", &interior_focus, "focus-line-width", &focus_width, - "focus-padding", &focus_pad, NULL); + "focus-padding", &focus_pad, + NULL); _gtk_check_button_get_props (check_button, &indicator_size, &indicator_spacing); diff --git a/gtk/gtkcheckmenuitem.c b/gtk/gtkcheckmenuitem.c index f32ac853dc..7b7dc70fba 100644 --- a/gtk/gtkcheckmenuitem.c +++ b/gtk/gtkcheckmenuitem.c @@ -257,8 +257,8 @@ gtk_check_menu_item_toggle_size_request (GtkMenuItem *menu_item, g_return_if_fail (GTK_IS_CHECK_MENU_ITEM (menu_item)); gtk_widget_style_get (GTK_WIDGET (menu_item), - "toggle_spacing", &toggle_spacing, - "indicator_size", &indicator_size, + "toggle-spacing", &toggle_spacing, + "indicator-size", &indicator_size, NULL); *requisition = indicator_size + toggle_spacing; @@ -351,7 +351,7 @@ gtk_check_menu_item_set_draw_as_radio (GtkCheckMenuItem *check_menu_item, gtk_widget_queue_draw (GTK_WIDGET (check_menu_item)); - g_object_notify (G_OBJECT (check_menu_item), "draw_as_radio"); + g_object_notify (G_OBJECT (check_menu_item), "draw-as-radio"); } } @@ -432,9 +432,9 @@ gtk_real_check_menu_item_draw_indicator (GtkCheckMenuItem *check_menu_item, widget = GTK_WIDGET (check_menu_item); gtk_widget_style_get (GTK_WIDGET (check_menu_item), - "toggle_spacing", &toggle_spacing, - "horizontal_padding", &horizontal_padding, - "indicator_size", &indicator_size, + "toggle-spacing", &toggle_spacing, + "horizontal-padding", &horizontal_padding, + "indicator-size", &indicator_size, NULL); toggle_size = GTK_MENU_ITEM (check_menu_item)->toggle_size; diff --git a/gtk/gtkcolorbutton.c b/gtk/gtkcolorbutton.c index 858d8d6387..23f3758965 100644 --- a/gtk/gtkcolorbutton.c +++ b/gtk/gtkcolorbutton.c @@ -884,7 +884,7 @@ gtk_color_button_set_use_alpha (GtkColorButton *color_button, render (color_button); gtk_widget_queue_draw (color_button->priv->drawing_area); - g_object_notify (G_OBJECT (color_button), "use_alpha"); + g_object_notify (G_OBJECT (color_button), "use-alpha"); } } diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c index 3ba309b6f5..e04f52e195 100644 --- a/gtk/gtkcolorsel.c +++ b/gtk/gtkcolorsel.c @@ -1720,8 +1720,8 @@ update_color (GtkColorSelection *colorsel) g_signal_emit (colorsel, color_selection_signals[COLOR_CHANGED], 0); g_object_freeze_notify (G_OBJECT (colorsel)); - g_object_notify (G_OBJECT (colorsel), "current_color"); - g_object_notify (G_OBJECT (colorsel), "current_alpha"); + g_object_notify (G_OBJECT (colorsel), "current-color"); + g_object_notify (G_OBJECT (colorsel), "current-alpha"); g_object_thaw_notify (G_OBJECT (colorsel)); g_object_unref (colorsel); @@ -2234,7 +2234,7 @@ gtk_color_selection_set_has_opacity_control (GtkColorSelection *colorsel, } color_sample_update_samples (colorsel); - g_object_notify (G_OBJECT (colorsel), "has_opacity_control"); + g_object_notify (G_OBJECT (colorsel), "has-opacity-control"); } } @@ -2284,7 +2284,7 @@ gtk_color_selection_set_has_palette (GtkColorSelection *colorsel, else gtk_widget_hide (priv->palette_frame); - g_object_notify (G_OBJECT (colorsel), "has_palette"); + g_object_notify (G_OBJECT (colorsel), "has-palette"); } } diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c index 7969c64420..8fd4a77807 100644 --- a/gtk/gtkcombobox.c +++ b/gtk/gtkcombobox.c @@ -2598,10 +2598,10 @@ menu_occupied (GtkMenu *menu, gtk_container_child_get (GTK_CONTAINER (menu), i->data, - "left_attach", &l, - "right_attach", &r, - "bottom_attach", &b, - "top_attach", &t, + "left-attach", &l, + "right-attach", &r, + "bottom-attach", &b, + "top-attach", &t, NULL); /* look if this item intersects with the given coordinates */ @@ -3129,10 +3129,10 @@ gtk_combo_box_menu_row_changed (GtkTreeModel *model, move it */ gtk_container_child_set (GTK_CONTAINER (combo_box->priv->popup_widget), item, - "left_attach", -1, - "right_attach", -1, - "top_attach", -1, - "bottom_attach", -1, + "left-attach", -1, + "right-attach", -1, + "top-attach", -1, + "bottom-attach", -1, NULL); gtk_combo_box_relayout_item (combo_box, item, iter, pitem); @@ -3307,7 +3307,7 @@ gtk_combo_box_list_destroy (GtkComboBox *combo_box) if (combo_box->priv->cell_view) { g_object_set (combo_box->priv->cell_view, - "background_set", FALSE, + "background-set", FALSE, NULL); } @@ -4208,7 +4208,7 @@ gtk_combo_box_set_wrap_width (GtkComboBox *combo_box, gtk_combo_box_check_appearance (combo_box); gtk_combo_box_relayout (combo_box); - g_object_notify (G_OBJECT (combo_box), "wrap_width"); + g_object_notify (G_OBJECT (combo_box), "wrap-width"); } } @@ -4258,7 +4258,7 @@ gtk_combo_box_set_row_span_column (GtkComboBox *combo_box, gtk_combo_box_relayout (combo_box); - g_object_notify (G_OBJECT (combo_box), "row_span_column"); + g_object_notify (G_OBJECT (combo_box), "row-span-column"); } } @@ -4308,7 +4308,7 @@ gtk_combo_box_set_column_span_column (GtkComboBox *combo_box, gtk_combo_box_relayout (combo_box); - g_object_notify (G_OBJECT (combo_box), "column_span_column"); + g_object_notify (G_OBJECT (combo_box), "column-span-column"); } } @@ -4996,7 +4996,7 @@ gtk_combo_box_set_add_tearoffs (GtkComboBox *combo_box, combo_box->priv->add_tearoffs = add_tearoffs; gtk_combo_box_check_appearance (combo_box); gtk_combo_box_relayout (combo_box); - g_object_notify (G_OBJECT (combo_box), "add_tearoffs"); + g_object_notify (G_OBJECT (combo_box), "add-tearoffs"); } } @@ -5118,7 +5118,7 @@ gtk_combo_box_set_focus_on_click (GtkComboBox *combo, { combo->priv->focus_on_click = focus_on_click; - g_object_notify (G_OBJECT (combo), "focus_on_click"); + g_object_notify (G_OBJECT (combo), "focus-on-click"); } } diff --git a/gtk/gtkcomboboxentry.c b/gtk/gtkcomboboxentry.c index d13fd26f89..3b2974e1ff 100644 --- a/gtk/gtkcomboboxentry.c +++ b/gtk/gtkcomboboxentry.c @@ -227,7 +227,7 @@ has_frame_changed (GtkComboBoxEntry *entry_box, { gboolean has_frame; - g_object_get (entry_box, "has_frame", &has_frame, NULL); + g_object_get (entry_box, "has-frame", &has_frame, NULL); gtk_entry_set_has_frame (GTK_ENTRY (entry_box->priv->entry), has_frame); } @@ -293,7 +293,7 @@ gtk_combo_box_entry_new_with_model (GtkTreeModel *model, ret = g_object_new (gtk_combo_box_entry_get_type (), "model", model, - "text_column", text_column, + "text-column", text_column, NULL); return ret; diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c index 98c42af180..995f904c12 100644 --- a/gtk/gtkcontainer.c +++ b/gtk/gtkcontainer.c @@ -904,7 +904,7 @@ gtk_container_set_border_width (GtkContainer *container, if (container->border_width != border_width) { container->border_width = border_width; - g_object_notify (G_OBJECT (container), "border_width"); + g_object_notify (G_OBJECT (container), "border-width"); if (GTK_WIDGET_REALIZED (container)) gtk_widget_queue_resize (GTK_WIDGET (container)); @@ -1034,7 +1034,7 @@ gtk_container_set_resize_mode (GtkContainer *container, container->resize_mode = resize_mode; gtk_widget_queue_resize (GTK_WIDGET (container)); - g_object_notify (G_OBJECT (container), "resize_mode"); + g_object_notify (G_OBJECT (container), "resize-mode"); } } diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c index bd80552acb..d20867a411 100644 --- a/gtk/gtkdialog.c +++ b/gtk/gtkdialog.c @@ -213,12 +213,9 @@ update_spacings (GtkDialog *dialog) widget = GTK_WIDGET (dialog); gtk_widget_style_get (widget, - "content_area_border", - &content_area_border, - "button_spacing", - &button_spacing, - "action_area_border", - &action_area_border, + "content-area-border", &content_area_border, + "button-spacing", &button_spacing, + "action-area-border", &action_area_border, NULL); gtk_container_set_border_width (GTK_CONTAINER (dialog->vbox), @@ -823,7 +820,7 @@ gtk_dialog_set_has_separator (GtkDialog *dialog, dialog->separator = NULL; } - g_object_notify (G_OBJECT (dialog), "has_separator"); + g_object_notify (G_OBJECT (dialog), "has-separator"); } /** diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c index e1212d8558..688b2a3cb8 100644 --- a/gtk/gtkentry.c +++ b/gtk/gtkentry.c @@ -2772,7 +2772,7 @@ gtk_entry_set_positions (GtkEntry *entry, entry->current_pos = current_pos; changed = TRUE; - g_object_notify (G_OBJECT (entry), "cursor_position"); + g_object_notify (G_OBJECT (entry), "cursor-position"); } if (selection_bound != -1 && @@ -2781,7 +2781,7 @@ gtk_entry_set_positions (GtkEntry *entry, entry->selection_bound = selection_bound; changed = TRUE; - g_object_notify (G_OBJECT (entry), "selection_bound"); + g_object_notify (G_OBJECT (entry), "selection-bound"); } g_object_thaw_notify (G_OBJECT (entry)); @@ -3431,7 +3431,7 @@ gtk_entry_adjust_scroll (GtkEntry *entry) entry->scroll_offset += weak_xoffset - text_area_width; } - g_object_notify (G_OBJECT (entry), "scroll_offset"); + g_object_notify (G_OBJECT (entry), "scroll-offset"); } static gint @@ -3935,7 +3935,7 @@ gtk_entry_set_invisible_char (GtkEntry *entry, return; entry->invisible_char = ch; - g_object_notify (G_OBJECT (entry), "invisible_char"); + g_object_notify (G_OBJECT (entry), "invisible-char"); gtk_entry_recompute (entry); } @@ -4017,7 +4017,7 @@ gtk_entry_set_max_length (GtkEntry *entry, gtk_editable_delete_text (GTK_EDITABLE (entry), max, -1); entry->text_max_length = max; - g_object_notify (G_OBJECT (entry), "max_length"); + g_object_notify (G_OBJECT (entry), "max-length"); } /** @@ -4063,7 +4063,7 @@ gtk_entry_set_activates_default (GtkEntry *entry, if (setting != entry->activates_default) { entry->activates_default = setting; - g_object_notify (G_OBJECT (entry), "activates_default"); + g_object_notify (G_OBJECT (entry), "activates-default"); } } @@ -4104,7 +4104,7 @@ gtk_entry_set_width_chars (GtkEntry *entry, if (entry->width_chars != n_chars) { entry->width_chars = n_chars; - g_object_notify (G_OBJECT (entry), "width_chars"); + g_object_notify (G_OBJECT (entry), "width-chars"); gtk_widget_queue_resize (GTK_WIDGET (entry)); } } @@ -4145,7 +4145,7 @@ gtk_entry_set_has_frame (GtkEntry *entry, gtk_widget_queue_resize (GTK_WIDGET (entry)); entry->has_frame = setting; - g_object_notify (G_OBJECT (entry), "has_frame"); + g_object_notify (G_OBJECT (entry), "has-frame"); } /** diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c index bad279f205..dd06d71747 100644 --- a/gtk/gtkentrycompletion.c +++ b/gtk/gtkentrycompletion.c @@ -1026,7 +1026,7 @@ gtk_entry_completion_set_minimum_key_length (GtkEntryCompletion *completion, { completion->priv->minimum_key_length = length; - g_object_notify (G_OBJECT (completion), "minimum_key_length"); + g_object_notify (G_OBJECT (completion), "minimum-key-length"); } } @@ -1209,7 +1209,7 @@ gtk_entry_completion_set_text_column (GtkEntryCompletion *completion, cell, "text", column); - g_object_notify (G_OBJECT (completion), "text_column"); + g_object_notify (G_OBJECT (completion), "text-column"); } /** @@ -1358,7 +1358,7 @@ _gtk_entry_completion_popup (GtkEntryCompletion *completion) column = gtk_tree_view_get_column (GTK_TREE_VIEW (completion->priv->action_view), 0); renderers = gtk_tree_view_column_get_cell_renderers (column); gtk_widget_ensure_style (completion->priv->tree_view); - g_object_set (GTK_CELL_RENDERER (renderers->data), "cell_background_gdk", + g_object_set (GTK_CELL_RENDERER (renderers->data), "cell-background-gdk", &completion->priv->tree_view->style->bg[GTK_STATE_NORMAL], NULL); g_list_free (renderers); @@ -1542,7 +1542,7 @@ gtk_entry_completion_set_inline_completion (GtkEntryCompletion *completion, { completion->priv->inline_completion = inline_completion; - g_object_notify (G_OBJECT (completion), "inline_completion"); + g_object_notify (G_OBJECT (completion), "inline-completion"); } } @@ -1587,7 +1587,7 @@ gtk_entry_completion_set_popup_completion (GtkEntryCompletion *completion, { completion->priv->popup_completion = popup_completion; - g_object_notify (G_OBJECT (completion), "popup_completion"); + g_object_notify (G_OBJECT (completion), "popup-completion"); } } diff --git a/gtk/gtkexpander.c b/gtk/gtkexpander.c index 069f2a6a62..c3d168c782 100644 --- a/gtk/gtkexpander.c +++ b/gtk/gtkexpander.c @@ -1213,7 +1213,7 @@ gtk_expander_new_with_mnemonic (const gchar *label) { return g_object_new (GTK_TYPE_EXPANDER, "label", label, - "use_underline", TRUE, + "use-underline", TRUE, NULL); } @@ -1492,7 +1492,7 @@ gtk_expander_set_use_underline (GtkExpander *expander, if (priv->label_widget && GTK_IS_LABEL (priv->label_widget)) gtk_label_set_use_underline (GTK_LABEL (priv->label_widget), use_underline); - g_object_notify (G_OBJECT (expander), "use_underline"); + g_object_notify (G_OBJECT (expander), "use-underline"); } } @@ -1546,7 +1546,7 @@ gtk_expander_set_use_markup (GtkExpander *expander, if (priv->label_widget && GTK_IS_LABEL (priv->label_widget)) gtk_label_set_use_markup (GTK_LABEL (priv->label_widget), use_markup); - g_object_notify (G_OBJECT (expander), "use_markup"); + g_object_notify (G_OBJECT (expander), "use-markup"); } } @@ -1617,7 +1617,7 @@ gtk_expander_set_label_widget (GtkExpander *expander, gtk_widget_queue_resize (GTK_WIDGET (expander)); g_object_freeze_notify (G_OBJECT (expander)); - g_object_notify (G_OBJECT (expander), "label_widget"); + g_object_notify (G_OBJECT (expander), "label-widget"); g_object_notify (G_OBJECT (expander), "label"); g_object_thaw_notify (G_OBJECT (expander)); } diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c index 8e75ffb142..5c6794b2df 100644 --- a/gtk/gtkfilechooserbutton.c +++ b/gtk/gtkfilechooserbutton.c @@ -2086,8 +2086,7 @@ dialog_notify_cb (GObject *dialog, if (g_object_interface_find_property (iface, pspec->name)) g_object_notify (user_data, pspec->name); - if (g_ascii_strcasecmp (pspec->name, "local-only") == 0 || - g_ascii_strcasecmp (pspec->name, "local_only") == 0) + if (g_ascii_strcasecmp (pspec->name, "local-only") == 0) { GtkFileChooserButtonPrivate *priv; diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index 0e7055c44e..ac6cbbf1fc 100644 --- a/gtk/gtkfilechooserdefault.c +++ b/gtk/gtkfilechooserdefault.c @@ -6694,8 +6694,8 @@ shortcuts_model_filter_new (GtkFileChooserDefault *impl, ShortcutsModelFilter *model; model = g_object_new (SHORTCUTS_MODEL_FILTER_TYPE, - "child_model", child_model, - "virtual_root", root, + "child-model", child_model, + "virtual-root", root, NULL); model->impl = impl; diff --git a/gtk/gtkfontbutton.c b/gtk/gtkfontbutton.c index 3d84acb93c..6773d184f3 100644 --- a/gtk/gtkfontbutton.c +++ b/gtk/gtkfontbutton.c @@ -505,7 +505,7 @@ gtk_font_button_set_use_font (GtkFontButton *font_button, else gtk_widget_set_style (font_button->priv->font_label, NULL); - g_object_notify (G_OBJECT (font_button), "use_font"); + g_object_notify (G_OBJECT (font_button), "use-font"); } } @@ -551,7 +551,7 @@ gtk_font_button_set_use_size (GtkFontButton *font_button, if (font_button->priv->use_font) gtk_font_button_label_use_font (font_button); - g_object_notify (G_OBJECT (font_button), "use_size"); + g_object_notify (G_OBJECT (font_button), "use-size"); } } @@ -595,7 +595,7 @@ gtk_font_button_set_show_style (GtkFontButton *font_button, gtk_font_button_update_font_info (font_button); - g_object_notify (G_OBJECT (font_button), "show_style"); + g_object_notify (G_OBJECT (font_button), "show-style"); } } @@ -645,7 +645,7 @@ gtk_font_button_set_show_size (GtkFontButton *font_button, gtk_font_button_update_font_info (font_button); - g_object_notify (G_OBJECT (font_button), "show_size"); + g_object_notify (G_OBJECT (font_button), "show-size"); } } @@ -705,7 +705,7 @@ gtk_font_button_set_font_name (GtkFontButton *font_button, else result = FALSE; - g_object_notify (G_OBJECT (font_button), "font_name"); + g_object_notify (G_OBJECT (font_button), "font-name"); return result; } @@ -766,7 +766,7 @@ dialog_ok_clicked (GtkWidget *widget, /* Set label font */ gtk_font_button_update_font_info (font_button); - g_object_notify (G_OBJECT (font_button), "font_name"); + g_object_notify (G_OBJECT (font_button), "font-name"); /* Emit font_set signal */ g_signal_emit (font_button, font_button_signals[FONT_SET], 0); diff --git a/gtk/gtkframe.c b/gtk/gtkframe.c index 922baead81..36c9c1c7c0 100644 --- a/gtk/gtkframe.c +++ b/gtk/gtkframe.c @@ -399,7 +399,7 @@ gtk_frame_set_label_widget (GtkFrame *frame, gtk_widget_queue_resize (GTK_WIDGET (frame)); g_object_freeze_notify (G_OBJECT (frame)); - g_object_notify (G_OBJECT (frame), "label_widget"); + g_object_notify (G_OBJECT (frame), "label-widget"); g_object_notify (G_OBJECT (frame), "label"); g_object_thaw_notify (G_OBJECT (frame)); } @@ -447,13 +447,13 @@ gtk_frame_set_label_align (GtkFrame *frame, if (xalign != frame->label_xalign) { frame->label_xalign = xalign; - g_object_notify (G_OBJECT (frame), "label_xalign"); + g_object_notify (G_OBJECT (frame), "label-xalign"); } if (yalign != frame->label_yalign) { frame->label_yalign = yalign; - g_object_notify (G_OBJECT (frame), "label_yalign"); + g_object_notify (G_OBJECT (frame), "label-yalign"); } g_object_thaw_notify (G_OBJECT (frame)); @@ -498,7 +498,7 @@ gtk_frame_set_shadow_type (GtkFrame *frame, if ((GtkShadowType) frame->shadow_type != type) { frame->shadow_type = type; - g_object_notify (G_OBJECT (frame), "shadow_type"); + g_object_notify (G_OBJECT (frame), "shadow-type"); if (GTK_WIDGET_DRAWABLE (frame)) { diff --git a/gtk/gtkhandlebox.c b/gtk/gtkhandlebox.c index 63bf94a507..f8c4e899aa 100644 --- a/gtk/gtkhandlebox.c +++ b/gtk/gtkhandlebox.c @@ -808,7 +808,7 @@ gtk_handle_box_set_shadow_type (GtkHandleBox *handle_box, if ((GtkShadowType) handle_box->shadow_type != type) { handle_box->shadow_type = type; - g_object_notify (G_OBJECT (handle_box), "shadow_type"); + g_object_notify (G_OBJECT (handle_box), "shadow-type"); gtk_widget_queue_resize (GTK_WIDGET (handle_box)); } } @@ -839,7 +839,7 @@ gtk_handle_box_set_handle_position (GtkHandleBox *handle_box, if ((GtkPositionType) handle_box->handle_position != position) { handle_box->handle_position = position; - g_object_notify (G_OBJECT (handle_box), "handle_position"); + g_object_notify (G_OBJECT (handle_box), "handle-position"); gtk_widget_queue_resize (GTK_WIDGET (handle_box)); } } @@ -872,8 +872,8 @@ gtk_handle_box_set_snap_edge (GtkHandleBox *handle_box, handle_box->snap_edge = edge; g_object_freeze_notify (G_OBJECT (handle_box)); - g_object_notify (G_OBJECT (handle_box), "snap_edge"); - g_object_notify (G_OBJECT (handle_box), "snap_edge_set"); + g_object_notify (G_OBJECT (handle_box), "snap-edge"); + g_object_notify (G_OBJECT (handle_box), "snap-edge-set"); g_object_thaw_notify (G_OBJECT (handle_box)); } } diff --git a/gtk/gtkhpaned.c b/gtk/gtkhpaned.c index 25a6f97565..c2860ccd43 100644 --- a/gtk/gtkhpaned.c +++ b/gtk/gtkhpaned.c @@ -134,7 +134,7 @@ gtk_hpaned_size_request (GtkWidget *widget, { gint handle_size; - gtk_widget_style_get (widget, "handle_size", &handle_size, NULL); + gtk_widget_style_get (widget, "handle-size", &handle_size, NULL); requisition->width += handle_size; } } @@ -166,7 +166,7 @@ gtk_hpaned_size_allocate (GtkWidget *widget, GtkRequisition child2_requisition; gint handle_size; - gtk_widget_style_get (widget, "handle_size", &handle_size, NULL); + gtk_widget_style_get (widget, "handle-size", &handle_size, NULL); gtk_widget_get_child_requisition (paned->child1, &child1_requisition); gtk_widget_get_child_requisition (paned->child2, &child2_requisition); diff --git a/gtk/gtkhscale.c b/gtk/gtkhscale.c index d954e9c550..87c7427898 100644 --- a/gtk/gtkhscale.c +++ b/gtk/gtkhscale.c @@ -215,7 +215,7 @@ gtk_hscale_get_layout_offsets (GtkScale *scale, return; } - gtk_widget_style_get (widget, "value_spacing", &value_spacing, NULL); + gtk_widget_style_get (widget, "value-spacing", &value_spacing, NULL); range = GTK_RANGE (widget); scale = GTK_SCALE (widget); diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c index fa2fad3e49..e20ab3d044 100644 --- a/gtk/gtkiconview.c +++ b/gtk/gtkiconview.c @@ -2117,8 +2117,8 @@ gtk_icon_view_paint_rubberband (GtkIconView *icon_view, return; gtk_widget_style_get (GTK_WIDGET (icon_view), - "selection_box_color", &fill_color_gdk, - "selection_box_alpha", &fill_color_alpha, + "selection-box-color", &fill_color_gdk, + "selection-box-alpha", &fill_color_alpha, NULL); if (!fill_color_gdk) @@ -3132,7 +3132,7 @@ gtk_icon_view_set_selection_mode (GtkIconView *icon_view, icon_view->priv->selection_mode = mode; - g_object_notify (G_OBJECT (icon_view), "selection_mode"); + g_object_notify (G_OBJECT (icon_view), "selection-mode"); } /** @@ -3322,7 +3322,7 @@ gtk_icon_view_set_text_column (GtkIconView *icon_view, gtk_icon_view_invalidate_sizes (icon_view); gtk_icon_view_queue_layout (icon_view); - g_object_notify (G_OBJECT (icon_view), "text_column"); + g_object_notify (G_OBJECT (icon_view), "text-column"); } /** @@ -3381,7 +3381,7 @@ gtk_icon_view_set_markup_column (GtkIconView *icon_view, gtk_icon_view_invalidate_sizes (icon_view); gtk_icon_view_queue_layout (icon_view); - g_object_notify (G_OBJECT (icon_view), "markup_column"); + g_object_notify (G_OBJECT (icon_view), "markup-column"); } /** @@ -3438,7 +3438,7 @@ gtk_icon_view_set_pixbuf_column (GtkIconView *icon_view, gtk_icon_view_invalidate_sizes (icon_view); gtk_icon_view_queue_layout (icon_view); - g_object_notify (G_OBJECT (icon_view), "pixbuf_column"); + g_object_notify (G_OBJECT (icon_view), "pixbuf-column"); } diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c index 70f926149a..719c02b004 100644 --- a/gtk/gtkimage.c +++ b/gtk/gtkimage.c @@ -950,7 +950,7 @@ gtk_image_set_from_stock (GtkImage *image, } g_object_notify (G_OBJECT (image), "stock"); - g_object_notify (G_OBJECT (image), "icon_size"); + g_object_notify (G_OBJECT (image), "icon-size"); g_object_thaw_notify (G_OBJECT (image)); } @@ -990,8 +990,8 @@ gtk_image_set_from_icon_set (GtkImage *image, */ } - g_object_notify (G_OBJECT (image), "icon_set"); - g_object_notify (G_OBJECT (image), "icon_size"); + g_object_notify (G_OBJECT (image), "icon-set"); + g_object_notify (G_OBJECT (image), "icon-size"); g_object_thaw_notify (G_OBJECT (image)); } @@ -1032,7 +1032,7 @@ gtk_image_set_from_animation (GtkImage *image, gdk_pixbuf_animation_get_height (animation)); } - g_object_notify (G_OBJECT (image), "pixbuf_animation"); + g_object_notify (G_OBJECT (image), "pixbuf-animation"); g_object_thaw_notify (G_OBJECT (image)); } @@ -1076,8 +1076,8 @@ gtk_image_set_from_icon_name (GtkImage *image, */ } - g_object_notify (G_OBJECT (image), "icon_name"); - g_object_notify (G_OBJECT (image), "icon_size"); + g_object_notify (G_OBJECT (image), "icon-name"); + g_object_notify (G_OBJECT (image), "icon-size"); g_object_thaw_notify (G_OBJECT (image)); } @@ -1839,7 +1839,7 @@ gtk_image_clear (GtkImage *image) g_object_freeze_notify (G_OBJECT (image)); if (image->storage_type != GTK_IMAGE_EMPTY) - g_object_notify (G_OBJECT (image), "storage_type"); + g_object_notify (G_OBJECT (image), "storage-type"); if (image->mask) { @@ -1851,7 +1851,7 @@ gtk_image_clear (GtkImage *image) if (image->icon_size != DEFAULT_ICON_SIZE) { image->icon_size = DEFAULT_ICON_SIZE; - g_object_notify (G_OBJECT (image), "icon_size"); + g_object_notify (G_OBJECT (image), "icon-size"); } switch (image->storage_type) @@ -1899,7 +1899,7 @@ gtk_image_clear (GtkImage *image) gtk_icon_set_unref (image->data.icon_set.icon_set); image->data.icon_set.icon_set = NULL; - g_object_notify (G_OBJECT (image), "icon_set"); + g_object_notify (G_OBJECT (image), "icon-set"); break; case GTK_IMAGE_ANIMATION: @@ -1909,7 +1909,7 @@ gtk_image_clear (GtkImage *image) g_object_unref (image->data.anim.anim); image->data.anim.anim = NULL; - g_object_notify (G_OBJECT (image), "pixbuf_animation"); + g_object_notify (G_OBJECT (image), "pixbuf-animation"); break; @@ -1921,7 +1921,7 @@ gtk_image_clear (GtkImage *image) g_object_unref (image->data.name.pixbuf); image->data.name.pixbuf = NULL; - g_object_notify (G_OBJECT (image), "icon_name"); + g_object_notify (G_OBJECT (image), "icon-name"); break; diff --git a/gtk/gtkimagemenuitem.c b/gtk/gtkimagemenuitem.c index f53114ddad..fc88fba8b5 100644 --- a/gtk/gtkimagemenuitem.c +++ b/gtk/gtkimagemenuitem.c @@ -222,7 +222,7 @@ gtk_image_menu_item_toggle_size_request (GtkMenuItem *menu_item, { guint toggle_spacing; gtk_widget_style_get (GTK_WIDGET (menu_item), - "toggle_spacing", &toggle_spacing, + "toggle-spacing", &toggle_spacing, NULL); *requisition = image_requisition.width + toggle_spacing; @@ -283,8 +283,8 @@ gtk_image_menu_item_size_allocate (GtkWidget *widget, guint horizontal_padding, toggle_spacing; gtk_widget_style_get (widget, - "horizontal_padding", &horizontal_padding, - "toggle_spacing", &toggle_spacing, + "horizontal-padding", &horizontal_padding, + "toggle-spacing", &toggle_spacing, NULL); /* Man this is lame hardcoding action, but I can't @@ -492,7 +492,7 @@ gtk_image_menu_item_set_image (GtkImageMenuItem *image_menu_item, gtk_widget_set_parent (image, GTK_WIDGET (image_menu_item)); g_object_set (image, "visible", show_image (image_menu_item), - "no_show_all", TRUE, + "no-show-all", TRUE, NULL); g_object_notify (G_OBJECT (image_menu_item), "image"); diff --git a/gtk/gtkitemfactory.c b/gtk/gtkitemfactory.c index 8f24aaca51..d91b93a9e0 100644 --- a/gtk/gtkitemfactory.c +++ b/gtk/gtkitemfactory.c @@ -1125,7 +1125,7 @@ gtk_item_factory_create_item (GtkItemFactory *ifactory, label = gtk_widget_new (GTK_TYPE_ACCEL_LABEL, "visible", TRUE, "parent", widget, - "accel_widget", widget, + "accel-widget", widget, "xalign", 0.0, NULL); gtk_label_set_text_with_mnemonic (GTK_LABEL (label), name); diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c index ffed9b0df3..79e9fd89c7 100644 --- a/gtk/gtklabel.c +++ b/gtk/gtklabel.c @@ -944,7 +944,7 @@ label_mnemonic_widget_weak_notify (gpointer data, GtkLabel *label = data; label->mnemonic_widget = NULL; - g_object_notify (G_OBJECT (label), "mnemonic_widget"); + g_object_notify (G_OBJECT (label), "mnemonic-widget"); } /** @@ -990,7 +990,7 @@ gtk_label_set_mnemonic_widget (GtkLabel *label, gtk_widget_add_mnemonic_label (label->mnemonic_widget, GTK_WIDGET (label)); } - g_object_notify (G_OBJECT (label), "mnemonic_widget"); + g_object_notify (G_OBJECT (label), "mnemonic-widget"); } /** @@ -1058,7 +1058,7 @@ gtk_label_set_use_markup_internal (GtkLabel *label, val = val != FALSE; if (label->use_markup != val) { - g_object_notify (G_OBJECT (label), "use_markup"); + g_object_notify (G_OBJECT (label), "use-markup"); label->use_markup = val; } } @@ -1070,7 +1070,7 @@ gtk_label_set_use_underline_internal (GtkLabel *label, val = val != FALSE; if (label->use_underline != val) { - g_object_notify (G_OBJECT (label), "use_underline"); + g_object_notify (G_OBJECT (label), "use-underline"); label->use_underline = val; } } @@ -2997,8 +2997,8 @@ gtk_label_set_selectable (GtkLabel *label, { g_object_freeze_notify (G_OBJECT (label)); g_object_notify (G_OBJECT (label), "selectable"); - g_object_notify (G_OBJECT (label), "cursor_position"); - g_object_notify (G_OBJECT (label), "selection_bound"); + g_object_notify (G_OBJECT (label), "cursor-position"); + g_object_notify (G_OBJECT (label), "selection-bound"); g_object_thaw_notify (G_OBJECT (label)); gtk_widget_queue_draw (GTK_WIDGET (label)); } @@ -3195,8 +3195,8 @@ gtk_label_select_region_index (GtkLabel *label, gtk_widget_queue_draw (GTK_WIDGET (label)); g_object_freeze_notify (G_OBJECT (label)); - g_object_notify (G_OBJECT (label), "cursor_position"); - g_object_notify (G_OBJECT (label), "selection_bound"); + g_object_notify (G_OBJECT (label), "cursor-position"); + g_object_notify (G_OBJECT (label), "selection-bound"); g_object_thaw_notify (G_OBJECT (label)); } } diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c index c4cd80a27a..31a9c360b8 100644 --- a/gtk/gtkmenu.c +++ b/gtk/gtkmenu.c @@ -1809,7 +1809,7 @@ gtk_menu_set_tearoff_state (GtkMenu *menu, menu->tearoff_window = gtk_widget_new (GTK_TYPE_WINDOW, "type", GTK_WINDOW_TOPLEVEL, "screen", gtk_widget_get_screen (menu->toplevel), - "app_paintable", TRUE, + "app-paintable", TRUE, NULL); @@ -1889,7 +1889,7 @@ gtk_menu_set_tearoff_state (GtkMenu *menu, menu->tearoff_adjustment = NULL; } - g_object_notify (G_OBJECT (menu), "tearoff_state"); + g_object_notify (G_OBJECT (menu), "tearoff-state"); } } @@ -1931,7 +1931,7 @@ gtk_menu_set_title (GtkMenu *menu, g_object_set_data (G_OBJECT (menu), "gtk-menu-title", NULL); gtk_menu_update_title (menu); - g_object_notify (G_OBJECT (menu), "tearoff_title"); + g_object_notify (G_OBJECT (menu), "tearoff-title"); } /** @@ -2574,7 +2574,7 @@ get_accel_path (GtkWidget *menu_item, if (GTK_IS_ACCEL_LABEL (label)) { g_object_get (label, - "accel_closure", &accel_closure, + "accel-closure", &accel_closure, NULL); if (accel_closure) { @@ -4014,10 +4014,10 @@ gtk_menu_attach (GtkMenu *menu, else { gtk_container_child_set (GTK_CONTAINER (child->parent), child, - "left_attach", left_attach, - "right_attach", right_attach, - "top_attach", top_attach, - "bottom_attach", bottom_attach, + "left-attach", left_attach, + "right-attach", right_attach, + "top-attach", top_attach, + "bottom-attach", bottom_attach, NULL); } } diff --git a/gtk/gtkmenubar.c b/gtk/gtkmenubar.c index d3b2195fc6..61b991e1d2 100644 --- a/gtk/gtkmenubar.c +++ b/gtk/gtkmenubar.c @@ -363,7 +363,7 @@ gtk_menu_bar_size_request (GtkWidget *widget, } } - gtk_widget_style_get (widget, "internal_padding", &ipadding, NULL); + gtk_widget_style_get (widget, "internal-padding", &ipadding, NULL); requisition->width += (GTK_CONTAINER (menu_bar)->border_width + ipadding + @@ -411,7 +411,7 @@ gtk_menu_bar_size_allocate (GtkWidget *widget, allocation->x, allocation->y, allocation->width, allocation->height); - gtk_widget_style_get (widget, "internal_padding", &ipadding, NULL); + gtk_widget_style_get (widget, "internal-padding", &ipadding, NULL); if (menu_shell->children) { @@ -775,7 +775,7 @@ get_shadow_type (GtkMenuBar *menubar) GtkShadowType shadow_type = GTK_SHADOW_OUT; gtk_widget_style_get (GTK_WIDGET (menubar), - "shadow_type", &shadow_type, + "shadow-type", &shadow_type, NULL); return shadow_type; diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c index 2073ca6f0c..c9e5e3a6dc 100644 --- a/gtk/gtkmenuitem.c +++ b/gtk/gtkmenuitem.c @@ -506,7 +506,7 @@ gtk_menu_item_size_request (GtkWidget *widget, g_return_if_fail (requisition != NULL); gtk_widget_style_get (widget, - "horizontal_padding", &horizontal_padding, + "horizontal-padding", &horizontal_padding, NULL); bin = GTK_BIN (widget); @@ -549,7 +549,7 @@ gtk_menu_item_size_request (GtkWidget *widget, guint arrow_spacing; gtk_widget_style_get (widget, - "arrow_spacing", &arrow_spacing, + "arrow-spacing", &arrow_spacing, NULL); requisition->width += child_requisition.height; @@ -609,7 +609,7 @@ gtk_menu_item_size_allocate (GtkWidget *widget, guint horizontal_padding; gtk_widget_style_get (widget, - "horizontal_padding", &horizontal_padding, + "horizontal-padding", &horizontal_padding, NULL); child_allocation.x = GTK_CONTAINER (widget)->border_width + widget->style->xthickness; @@ -756,7 +756,7 @@ gtk_menu_item_paint (GtkWidget *widget, (GTK_BIN (menu_item)->child)) { gtk_widget_style_get (widget, - "selected_shadow_type", &selected_shadow_type, + "selected-shadow-type", &selected_shadow_type, NULL); gtk_paint_box (widget->style, widget->window, @@ -781,7 +781,7 @@ gtk_menu_item_paint (GtkWidget *widget, direction = gtk_widget_get_direction (widget); gtk_widget_style_get (widget, - "horizontal_padding", &horizontal_padding, + "horizontal-padding", &horizontal_padding, NULL); context = gtk_widget_get_pango_context (GTK_BIN (menu_item)->child); @@ -826,7 +826,7 @@ gtk_menu_item_paint (GtkWidget *widget, guint horizontal_padding; gtk_widget_style_get (widget, - "horizontal_padding", &horizontal_padding, + "horizontal-padding", &horizontal_padding, NULL); gtk_paint_hline (widget->style, widget->window, GTK_STATE_NORMAL, @@ -1071,9 +1071,9 @@ get_offsets (GtkMenu *menu, gint vertical_padding; gtk_widget_style_get (GTK_WIDGET (menu), - "horizontal_offset", horizontal_offset, - "vertical_offset", vertical_offset, - "vertical_padding", &vertical_padding, + "horizontal-offset", horizontal_offset, + "vertical-offset", vertical_offset, + "vertical-padding", &vertical_padding, NULL); *vertical_offset -= GTK_WIDGET (menu)->style->ythickness; diff --git a/gtk/gtkmenutoolbutton.c b/gtk/gtkmenutoolbutton.c index 7ef15de35a..dbc099d5bf 100644 --- a/gtk/gtkmenutoolbutton.c +++ b/gtk/gtkmenutoolbutton.c @@ -511,7 +511,7 @@ gtk_menu_tool_button_new_from_stock (const gchar *stock_id) g_return_val_if_fail (stock_id != NULL, NULL); button = g_object_new (GTK_TYPE_MENU_TOOL_BUTTON, - "stock_id", stock_id, + "stock-id", stock_id, NULL); return GTK_TOOL_ITEM (button); diff --git a/gtk/gtkmessagedialog.c b/gtk/gtkmessagedialog.c index f717418987..5ca713d1c0 100644 --- a/gtk/gtkmessagedialog.c +++ b/gtk/gtkmessagedialog.c @@ -403,7 +403,7 @@ gtk_message_dialog_new (GtkWindow *parent, g_return_val_if_fail (parent == NULL || GTK_IS_WINDOW (parent), NULL); widget = g_object_new (GTK_TYPE_MESSAGE_DIALOG, - "message_type", type, + "message-type", type, "buttons", buttons, NULL); dialog = GTK_DIALOG (widget); @@ -712,7 +712,7 @@ gtk_message_dialog_style_set (GtkWidget *widget, if (parent) { - gtk_widget_style_get (widget, "message_border", + gtk_widget_style_get (widget, "message-border", &border_width, NULL); gtk_container_set_border_width (GTK_CONTAINER (parent), @@ -720,7 +720,7 @@ gtk_message_dialog_style_set (GtkWidget *widget, } gtk_widget_style_get (widget, - "use_separator", &use_separator, + "use-separator", &use_separator, NULL); _gtk_dialog_set_ignore_separator (GTK_DIALOG (widget), FALSE); gtk_dialog_set_has_separator (GTK_DIALOG (widget), use_separator); diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c index 0c42e2003b..412a8c5306 100644 --- a/gtk/gtknotebook.c +++ b/gtk/gtknotebook.c @@ -2054,10 +2054,10 @@ gtk_notebook_style_set (GtkWidget *widget, notebook = GTK_NOTEBOOK (widget); gtk_widget_style_get (widget, - "has_backward_stepper", &has_before_previous, - "has_secondary_forward_stepper", &has_before_next, - "has_secondary_backward_stepper", &has_after_previous, - "has_forward_stepper", &has_after_next, + "has-backward-stepper", &has_before_previous, + "has-secondary-forward-stepper", &has_before_next, + "has-secondary-backward-stepper", &has_after_previous, + "has-forward-stepper", &has_after_next, NULL); notebook->has_before_previous = has_before_previous; @@ -4061,8 +4061,8 @@ gtk_notebook_set_tab_border_internal (GtkNotebook *notebook, gtk_widget_queue_resize (GTK_WIDGET (notebook)); g_object_freeze_notify (G_OBJECT (notebook)); - g_object_notify (G_OBJECT (notebook), "tab_hborder"); - g_object_notify (G_OBJECT (notebook), "tab_vborder"); + g_object_notify (G_OBJECT (notebook), "tab-hborder"); + g_object_notify (G_OBJECT (notebook), "tab-vborder"); g_object_thaw_notify (G_OBJECT (notebook)); } @@ -4080,7 +4080,7 @@ gtk_notebook_set_tab_hborder_internal (GtkNotebook *notebook, if (GTK_WIDGET_VISIBLE (notebook) && notebook->show_tabs) gtk_widget_queue_resize (GTK_WIDGET (notebook)); - g_object_notify (G_OBJECT (notebook), "tab_hborder"); + g_object_notify (G_OBJECT (notebook), "tab-hborder"); } static void @@ -4097,7 +4097,7 @@ gtk_notebook_set_tab_vborder_internal (GtkNotebook *notebook, if (GTK_WIDGET_VISIBLE (notebook) && notebook->show_tabs) gtk_widget_queue_resize (GTK_WIDGET (notebook)); - g_object_notify (G_OBJECT (notebook), "tab_vborder"); + g_object_notify (G_OBJECT (notebook), "tab-vborder"); } /* Public GtkNotebook Page Insert/Remove Methods : @@ -4399,11 +4399,11 @@ gtk_notebook_insert_page_menu (GtkNotebook *notebook, G_CALLBACK (gtk_notebook_mnemonic_activate_switch_page), notebook); - gtk_widget_child_notify (child, "tab_expand"); - gtk_widget_child_notify (child, "tab_fill"); - gtk_widget_child_notify (child, "tab_pack"); - gtk_widget_child_notify (child, "tab_label"); - gtk_widget_child_notify (child, "menu_label"); + gtk_widget_child_notify (child, "tab-expand"); + gtk_widget_child_notify (child, "tab-fill"); + gtk_widget_child_notify (child, "tab-pack"); + gtk_widget_child_notify (child, "tab-label"); + gtk_widget_child_notify (child, "menu-label"); gtk_widget_child_notify (child, "position"); gtk_widget_thaw_child_notify (child); @@ -4670,7 +4670,7 @@ gtk_notebook_set_show_border (GtkNotebook *notebook, if (GTK_WIDGET_VISIBLE (notebook)) gtk_widget_queue_resize (GTK_WIDGET (notebook)); - g_object_notify (G_OBJECT (notebook), "show_border"); + g_object_notify (G_OBJECT (notebook), "show-border"); } } @@ -4739,7 +4739,7 @@ gtk_notebook_set_show_tabs (GtkNotebook *notebook, } gtk_widget_queue_resize (GTK_WIDGET (notebook)); - g_object_notify (G_OBJECT (notebook), "show_tabs"); + g_object_notify (G_OBJECT (notebook), "show-tabs"); } /** @@ -4780,7 +4780,7 @@ gtk_notebook_set_tab_pos (GtkNotebook *notebook, gtk_widget_queue_resize (GTK_WIDGET (notebook)); } - g_object_notify (G_OBJECT (notebook), "tab_pos"); + g_object_notify (G_OBJECT (notebook), "tab-pos"); } /** @@ -4946,7 +4946,7 @@ gtk_notebook_popup_enable (GtkNotebook *notebook) GTK_WIDGET (notebook), gtk_notebook_menu_detacher); - g_object_notify (G_OBJECT (notebook), "enable_popup"); + g_object_notify (G_OBJECT (notebook), "enable-popup"); } /** @@ -4967,7 +4967,7 @@ gtk_notebook_popup_disable (GtkNotebook *notebook) (GtkCallback) gtk_notebook_menu_label_unparent, NULL); gtk_widget_destroy (notebook->menu); - g_object_notify (G_OBJECT (notebook), "enable_popup"); + g_object_notify (G_OBJECT (notebook), "enable-popup"); } /* Public GtkNotebook Page Properties Functions: @@ -5084,7 +5084,7 @@ gtk_notebook_set_tab_label (GtkNotebook *notebook, } gtk_notebook_update_tab_states (notebook); - gtk_widget_child_notify (child, "tab_label"); + gtk_widget_child_notify (child, "tab-label"); } /** @@ -5108,7 +5108,7 @@ gtk_notebook_set_tab_label_text (GtkNotebook *notebook, if (tab_text) tab_label = gtk_label_new (tab_text); gtk_notebook_set_tab_label (notebook, child, tab_label); - gtk_widget_child_notify (child, "tab_label"); + gtk_widget_child_notify (child, "tab-label"); } /** @@ -5217,7 +5217,7 @@ gtk_notebook_set_menu_label (GtkNotebook *notebook, if (notebook->menu) gtk_notebook_menu_item_create (notebook, list); - gtk_widget_child_notify (child, "menu_label"); + gtk_widget_child_notify (child, "menu-label"); } /** @@ -5240,7 +5240,7 @@ gtk_notebook_set_menu_label_text (GtkNotebook *notebook, if (menu_text) menu_label = gtk_label_new (menu_text); gtk_notebook_set_menu_label (notebook, child, menu_label); - gtk_widget_child_notify (child, "menu_label"); + gtk_widget_child_notify (child, "menu-label"); } /** @@ -5331,15 +5331,15 @@ gtk_notebook_set_tab_label_packing (GtkNotebook *notebook, gtk_widget_freeze_child_notify (child); page->expand = expand; - gtk_widget_child_notify (child, "tab_expand"); + gtk_widget_child_notify (child, "tab-expand"); page->fill = fill; - gtk_widget_child_notify (child, "tab_fill"); + gtk_widget_child_notify (child, "tab-fill"); if (page->pack != pack_type) { page->pack = pack_type; gtk_notebook_child_reordered (notebook, page); } - gtk_widget_child_notify (child, "tab_pack"); + gtk_widget_child_notify (child, "tab-pack"); gtk_widget_child_notify (child, "position"); if (notebook->show_tabs) gtk_notebook_pages_allocate (notebook); @@ -5434,7 +5434,7 @@ gtk_notebook_reorder_child (GtkNotebook *notebook, /* Move around the menu items if necessary */ gtk_notebook_child_reordered (notebook, page); - gtk_widget_child_notify (child, "tab_pack"); + gtk_widget_child_notify (child, "tab-pack"); gtk_widget_child_notify (child, "position"); if (notebook->show_tabs) diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c index 4754ab317a..a6b48e9537 100644 --- a/gtk/gtkpaned.c +++ b/gtk/gtkpaned.c @@ -795,7 +795,7 @@ update_drag (GtkPaned *paned) if (is_rtl (paned)) { gtk_widget_style_get (GTK_WIDGET (paned), - "handle_size", &handle_size, + "handle-size", &handle_size, NULL); size = GTK_WIDGET (paned)->allocation.width - pos - handle_size; @@ -1110,7 +1110,7 @@ gtk_paned_set_position (GtkPaned *paned, g_object_freeze_notify (object); g_object_notify (object, "position"); - g_object_notify (object, "position_set"); + g_object_notify (object, "position-set"); g_object_thaw_notify (object); gtk_widget_queue_resize (GTK_WIDGET (paned)); @@ -1211,9 +1211,9 @@ gtk_paned_compute_position (GtkPaned *paned, if (paned->child1_size != old_position) g_object_notify (G_OBJECT (paned), "position"); if (paned->min_position != old_min_position) - g_object_notify (G_OBJECT (paned), "min_position"); + g_object_notify (G_OBJECT (paned), "min-position"); if (paned->max_position != old_max_position) - g_object_notify (G_OBJECT (paned), "max_position"); + g_object_notify (G_OBJECT (paned), "max-position"); g_object_thaw_notify (G_OBJECT (paned)); paned->last_allocation = allocation; diff --git a/gtk/gtkprogress.c b/gtk/gtkprogress.c index 4a6b819f48..cb3fcc2920 100644 --- a/gtk/gtkprogress.c +++ b/gtk/gtkprogress.c @@ -653,7 +653,7 @@ gtk_progress_set_show_text (GtkProgress *progress, gtk_widget_queue_resize (GTK_WIDGET (progress)); - g_object_notify (G_OBJECT (progress), "show_text"); + g_object_notify (G_OBJECT (progress), "show-text"); } } @@ -672,13 +672,13 @@ gtk_progress_set_text_alignment (GtkProgress *progress, if (progress->x_align != x_align) { progress->x_align = x_align; - g_object_notify (G_OBJECT (progress), "text_xalign"); + g_object_notify (G_OBJECT (progress), "text-xalign"); } if (progress->y_align != y_align) { progress->y_align = y_align; - g_object_notify (G_OBJECT (progress), "text_yalign"); + g_object_notify (G_OBJECT (progress), "text-yalign"); } g_object_thaw_notify (G_OBJECT (progress)); @@ -752,7 +752,7 @@ gtk_progress_set_activity_mode (GtkProgress *progress, if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (progress))) gtk_widget_queue_resize (GTK_WIDGET (progress)); - g_object_notify (G_OBJECT (progress), "activity_mode"); + g_object_notify (G_OBJECT (progress), "activity-mode"); } } diff --git a/gtk/gtkprogressbar.c b/gtk/gtkprogressbar.c index 0979f3a693..95951c04a3 100644 --- a/gtk/gtkprogressbar.c +++ b/gtk/gtkprogressbar.c @@ -934,7 +934,7 @@ gtk_progress_bar_set_bar_style_internal (GtkProgressBar *pbar, if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (pbar))) gtk_widget_queue_resize (GTK_WIDGET (pbar)); - g_object_notify (G_OBJECT (pbar), "bar_style"); + g_object_notify (G_OBJECT (pbar), "bar-style"); } } @@ -952,7 +952,7 @@ gtk_progress_bar_set_discrete_blocks_internal (GtkProgressBar *pbar, if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (pbar))) gtk_widget_queue_resize (GTK_WIDGET (pbar)); - g_object_notify (G_OBJECT (pbar), "discrete_blocks"); + g_object_notify (G_OBJECT (pbar), "discrete-blocks"); } } @@ -965,7 +965,7 @@ gtk_progress_bar_set_activity_step_internal (GtkProgressBar *pbar, if (pbar->activity_step != step) { pbar->activity_step = step; - g_object_notify (G_OBJECT (pbar), "activity_step"); + g_object_notify (G_OBJECT (pbar), "activity-step"); } } @@ -979,7 +979,7 @@ gtk_progress_bar_set_activity_blocks_internal (GtkProgressBar *pbar, if (pbar->activity_blocks != blocks) { pbar->activity_blocks = blocks; - g_object_notify (G_OBJECT (pbar), "activity_blocks"); + g_object_notify (G_OBJECT (pbar), "activity-blocks"); } } @@ -1076,7 +1076,7 @@ gtk_progress_bar_set_pulse_step (GtkProgressBar *pbar, pbar->pulse_fraction = fraction; - g_object_notify (G_OBJECT (pbar), "pulse_step"); + g_object_notify (G_OBJECT (pbar), "pulse-step"); } void diff --git a/gtk/gtkradioaction.c b/gtk/gtkradioaction.c index 815dc4f254..45e1a5b888 100644 --- a/gtk/gtkradioaction.c +++ b/gtk/gtkradioaction.c @@ -219,7 +219,7 @@ gtk_radio_action_new (const gchar *name, "name", name, "label", label, "tooltip", tooltip, - "stock_id", stock_id, + "stock-id", stock_id, "value", value, NULL); @@ -234,8 +234,6 @@ gtk_radio_action_finalize (GObject *object) action = GTK_RADIO_ACTION (object); - g_print ("finalize %p\n", action); - action->private_data->group = g_slist_remove (action->private_data->group, action); tmp_list = action->private_data->group; @@ -368,7 +366,7 @@ static GtkWidget * create_menu_item (GtkAction *action) { return g_object_new (GTK_TYPE_CHECK_MENU_ITEM, - "draw_as_radio", TRUE, + "draw-as-radio", TRUE, NULL); } diff --git a/gtk/gtkradiobutton.c b/gtk/gtkradiobutton.c index 3b3a61ac88..4fc4df5ada 100644 --- a/gtk/gtkradiobutton.c +++ b/gtk/gtkradiobutton.c @@ -321,7 +321,10 @@ gtk_radio_button_new_with_mnemonic (GSList *group, { GtkWidget *radio_button; - radio_button = g_object_new (GTK_TYPE_RADIO_BUTTON, "label", label, "use_underline", TRUE, NULL); + radio_button = g_object_new (GTK_TYPE_RADIO_BUTTON, + "label", label, + "use-underline", TRUE, + NULL); if (group) gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_button), group); @@ -682,7 +685,7 @@ gtk_radio_button_draw_indicator (GtkCheckButton *check_button, toggle_button = GTK_TOGGLE_BUTTON (check_button); gtk_widget_style_get (widget, - "interior_focus", &interior_focus, + "interior-focus", &interior_focus, "focus-line-width", &focus_width, "focus-padding", &focus_pad, NULL); diff --git a/gtk/gtkradiotoolbutton.c b/gtk/gtkradiotoolbutton.c index f5c52f7412..5f851bf250 100644 --- a/gtk/gtkradiotoolbutton.c +++ b/gtk/gtkradiotoolbutton.c @@ -179,7 +179,7 @@ gtk_radio_tool_button_new_from_stock (GSList *group, g_return_val_if_fail (stock_id != NULL, NULL); button = g_object_new (GTK_TYPE_RADIO_TOOL_BUTTON, - "stock_id", stock_id, + "stock-id", stock_id, NULL); diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c index e78446a3a0..d8340eb7c5 100644 --- a/gtk/gtkrange.c +++ b/gtk/gtkrange.c @@ -520,7 +520,7 @@ gtk_range_set_update_policy (GtkRange *range, if (range->update_policy != policy) { range->update_policy = policy; - g_object_notify (G_OBJECT (range), "update_policy"); + g_object_notify (G_OBJECT (range), "update-policy"); } } @@ -1783,12 +1783,12 @@ gtk_range_get_props (GtkRange *range, gint tmp_arrow_displacement_x, tmp_arrow_displacement_y; gtk_widget_style_get (widget, - "slider_width", &tmp_slider_width, - "trough_border", &tmp_trough_border, - "stepper_size", &tmp_stepper_size, - "stepper_spacing", &tmp_stepper_spacing, - "arrow_displacement_x", &tmp_arrow_displacement_x, - "arrow_displacement_y", &tmp_arrow_displacement_y, + "slider-width", &tmp_slider_width, + "trough-border", &tmp_trough_border, + "stepper-size", &tmp_stepper_size, + "stepper-spacing", &tmp_stepper_spacing, + "arrow-displacement-x", &tmp_arrow_displacement_x, + "arrow-displacement-y", &tmp_arrow_displacement_y, NULL); if (GTK_WIDGET_CAN_FOCUS (range)) diff --git a/gtk/gtkruler.c b/gtk/gtkruler.c index 779718aeba..77f31e24ba 100644 --- a/gtk/gtkruler.c +++ b/gtk/gtkruler.c @@ -292,7 +292,7 @@ gtk_ruler_set_range (GtkRuler *ruler, if (ruler->max_size != max_size) { ruler->max_size = max_size; - g_object_notify (G_OBJECT (ruler), "max_size"); + g_object_notify (G_OBJECT (ruler), "max-size"); } g_object_thaw_notify (G_OBJECT (ruler)); diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c index a28bea7403..7a73da8601 100644 --- a/gtk/gtkscale.c +++ b/gtk/gtkscale.c @@ -461,7 +461,7 @@ gtk_scale_set_draw_value (GtkScale *scale, gtk_widget_queue_resize (GTK_WIDGET (scale)); - g_object_notify (G_OBJECT (scale), "draw_value"); + g_object_notify (G_OBJECT (scale), "draw-value"); } } @@ -487,7 +487,7 @@ gtk_scale_set_value_pos (GtkScale *scale, if (GTK_WIDGET_VISIBLE (scale) && GTK_WIDGET_MAPPED (scale)) gtk_widget_queue_resize (GTK_WIDGET (scale)); - g_object_notify (G_OBJECT (scale), "value_pos"); + g_object_notify (G_OBJECT (scale), "value-pos"); } } @@ -520,7 +520,7 @@ gtk_scale_get_range_border (GtkRange *range, if (scale->draw_value) { gint value_spacing; - gtk_widget_style_get (widget, "value_spacing", &value_spacing, NULL); + gtk_widget_style_get (widget, "value-spacing", &value_spacing, NULL); switch (scale->value_pos) { @@ -604,7 +604,7 @@ gtk_scale_style_set (GtkWidget *widget, range = GTK_RANGE (widget); gtk_widget_style_get (widget, - "slider_length", &slider_length, + "slider-length", &slider_length, NULL); range->min_slider_size = slider_length; diff --git a/gtk/gtkscrollbar.c b/gtk/gtkscrollbar.c index 226f675dde..e58f646058 100644 --- a/gtk/gtkscrollbar.c +++ b/gtk/gtkscrollbar.c @@ -148,12 +148,12 @@ gtk_scrollbar_style_set (GtkWidget *widget, range = GTK_RANGE (widget); gtk_widget_style_get (widget, - "min_slider_length", &slider_length, - "fixed_slider_length", &fixed_size, - "has_backward_stepper", &has_a, - "has_secondary_forward_stepper", &has_b, - "has_secondary_backward_stepper", &has_c, - "has_forward_stepper", &has_d, + "min-slider-length", &slider_length, + "fixed-slider-length", &fixed_size, + "has-backward-stepper", &has_a, + "has-secondary-forward-stepper", &has_b, + "has-secondary-backward-stepper", &has_c, + "has-forward-stepper", &has_d, NULL); range->min_slider_size = slider_length; diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c index 7618b2a018..59f244b3d3 100644 --- a/gtk/gtkscrolledwindow.c +++ b/gtk/gtkscrolledwindow.c @@ -513,8 +513,8 @@ gtk_scrolled_window_set_policy (GtkScrolledWindow *scrolled_window, gtk_widget_queue_resize (GTK_WIDGET (scrolled_window)); g_object_freeze_notify (object); - g_object_notify (object, "hscrollbar_policy"); - g_object_notify (object, "vscrollbar_policy"); + g_object_notify (object, "hscrollbar-policy"); + g_object_notify (object, "vscrollbar-policy"); g_object_thaw_notify (object); } } @@ -553,7 +553,7 @@ gtk_scrolled_window_set_placement (GtkScrolledWindow *scrolled_window, gtk_widget_queue_resize (GTK_WIDGET (scrolled_window)); - g_object_notify (G_OBJECT (scrolled_window), "window_placement"); + g_object_notify (G_OBJECT (scrolled_window), "window-placement"); } } @@ -599,7 +599,7 @@ gtk_scrolled_window_set_shadow_type (GtkScrolledWindow *scrolled_window, gtk_widget_queue_resize (GTK_WIDGET (scrolled_window)); - g_object_notify (G_OBJECT (scrolled_window), "shadow_type"); + g_object_notify (G_OBJECT (scrolled_window), "shadow-type"); } } @@ -1413,7 +1413,7 @@ _gtk_scrolled_window_get_scrollbar_spacing (GtkScrolledWindow *scrolled_window) gint scrollbar_spacing; gtk_widget_style_get (GTK_WIDGET (scrolled_window), - "scrollbar_spacing", &scrollbar_spacing, + "scrollbar-spacing", &scrollbar_spacing, NULL); return scrollbar_spacing; diff --git a/gtk/gtkseparatortoolitem.c b/gtk/gtkseparatortoolitem.c index fd56650dd5..3fcfa61eac 100644 --- a/gtk/gtkseparatortoolitem.c +++ b/gtk/gtkseparatortoolitem.c @@ -102,7 +102,7 @@ get_space_size (GtkToolItem *tool_item) if (GTK_IS_TOOLBAR (parent)) { gtk_widget_style_get (parent, - "space_size", &space_size, + "space-size", &space_size, NULL); } diff --git a/gtk/gtksocket.c b/gtk/gtksocket.c index d3fe2756b4..a1679fbe6b 100644 --- a/gtk/gtksocket.c +++ b/gtk/gtksocket.c @@ -817,7 +817,7 @@ static void gtk_socket_notify (GObject *object, GParamSpec *pspec) { - if (!strcmp (pspec->name, "is_focus")) + if (!strcmp (pspec->name, "is-focus")) return; socket_update_focus_in (GTK_SOCKET (object)); diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c index 435470a735..ddffe6049a 100644 --- a/gtk/gtkspinbutton.c +++ b/gtk/gtkspinbutton.c @@ -1563,7 +1563,7 @@ gtk_spin_button_configure (GtkSpinButton *spin_button, if (spin_button->climb_rate != climb_rate) { spin_button->climb_rate = climb_rate; - g_object_notify (G_OBJECT (spin_button), "climb_rate"); + g_object_notify (G_OBJECT (spin_button), "climb-rate"); } g_object_thaw_notify (G_OBJECT (spin_button)); @@ -1921,7 +1921,7 @@ gtk_spin_button_set_update_policy (GtkSpinButton *spin_button, if (spin_button->update_policy != policy) { spin_button->update_policy = policy; - g_object_notify (G_OBJECT (spin_button), "update_policy"); + g_object_notify (G_OBJECT (spin_button), "update-policy"); } } @@ -2049,7 +2049,7 @@ spin_button_get_shadow_type (GtkSpinButton *spin_button) { GtkShadowType rc_shadow_type; - gtk_widget_style_get (GTK_WIDGET (spin_button), "shadow_type", &rc_shadow_type, NULL); + gtk_widget_style_get (GTK_WIDGET (spin_button), "shadow-type", &rc_shadow_type, NULL); return rc_shadow_type; } @@ -2078,7 +2078,7 @@ gtk_spin_button_set_snap_to_ticks (GtkSpinButton *spin_button, if (new_val && GTK_ENTRY (spin_button)->editable) gtk_spin_button_update (spin_button); - g_object_notify (G_OBJECT (spin_button), "snap_to_ticks"); + g_object_notify (G_OBJECT (spin_button), "snap-to-ticks"); } } diff --git a/gtk/gtkstatusbar.c b/gtk/gtkstatusbar.c index 36cd3625b1..13beb6ef3b 100644 --- a/gtk/gtkstatusbar.c +++ b/gtk/gtkstatusbar.c @@ -222,7 +222,7 @@ gtk_statusbar_init (GtkStatusbar *statusbar) statusbar->has_resize_grip = TRUE; - gtk_widget_style_get (GTK_WIDGET (statusbar), "shadow_type", &shadow_type, NULL); + gtk_widget_style_get (GTK_WIDGET (statusbar), "shadow-type", &shadow_type, NULL); statusbar->frame = gtk_frame_new (NULL); gtk_frame_set_shadow_type (GTK_FRAME (statusbar->frame), shadow_type); @@ -429,7 +429,7 @@ gtk_statusbar_set_has_resize_grip (GtkStatusbar *statusbar, gtk_statusbar_destroy_window (statusbar); } - g_object_notify (G_OBJECT (statusbar), "has_resize_grip"); + g_object_notify (G_OBJECT (statusbar), "has-resize-grip"); } } @@ -759,7 +759,7 @@ gtk_statusbar_size_request (GtkWidget *widget, statusbar = GTK_STATUSBAR (widget); - gtk_widget_style_get (GTK_WIDGET (statusbar), "shadow_type", &shadow_type, NULL); + gtk_widget_style_get (GTK_WIDGET (statusbar), "shadow-type", &shadow_type, NULL); gtk_frame_set_shadow_type (GTK_FRAME (statusbar->frame), shadow_type); GTK_WIDGET_CLASS (parent_class)->size_request (widget, requisition); diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c index d014c798fb..ad4093ba9a 100644 --- a/gtk/gtkstyle.c +++ b/gtk/gtkstyle.c @@ -3235,8 +3235,8 @@ option_menu_get_props (GtkWidget *widget, if (widget) gtk_widget_style_get (widget, - "indicator_size", &tmp_size, - "indicator_spacing", &tmp_spacing, + "indicator-size", &tmp_size, + "indicator-spacing", &tmp_spacing, NULL); if (tmp_size) @@ -3466,7 +3466,7 @@ gtk_default_draw_flat_box (GtkStyle *style, GdkColor *color = NULL; gtk_widget_style_get (widget, - "even_row_color", &color, + "even-row-color", &color, NULL); if (color) @@ -3484,7 +3484,7 @@ gtk_default_draw_flat_box (GtkStyle *style, GdkColor *color; gtk_widget_style_get (widget, - "odd_row_color", &color, + "odd-row-color", &color, NULL); if (color) @@ -3497,7 +3497,7 @@ gtk_default_draw_flat_box (GtkStyle *style, else { gtk_widget_style_get (widget, - "even_row_color", &color, + "even-row-color", &color, NULL); if (color) @@ -3518,11 +3518,11 @@ gtk_default_draw_flat_box (GtkStyle *style, if (!strcmp ("cell_odd_sorted", detail)) gtk_widget_style_get (widget, - "odd_row_color", &color, + "odd-row-color", &color, NULL); else gtk_widget_style_get (widget, - "even_row_color", &color, + "even-row-color", &color, NULL); if (color) @@ -3543,7 +3543,7 @@ gtk_default_draw_flat_box (GtkStyle *style, GdkColor *color = NULL; gtk_widget_style_get (widget, - "odd_row_color", &color, + "odd-row-color", &color, NULL); if (color) @@ -3556,7 +3556,7 @@ gtk_default_draw_flat_box (GtkStyle *style, else { gtk_widget_style_get (widget, - "even_row_color", &color, + "even-row-color", &color, NULL); if (color) diff --git a/gtk/gtktable.c b/gtk/gtktable.c index 2cb4474a27..055224557f 100644 --- a/gtk/gtktable.c +++ b/gtk/gtktable.c @@ -554,7 +554,7 @@ gtk_table_resize (GtkTable *table, table->rows[i].shrink = 0; } - g_object_notify (G_OBJECT (table), "n_rows"); + g_object_notify (G_OBJECT (table), "n-rows"); } if (n_cols != table->ncols) @@ -576,7 +576,7 @@ gtk_table_resize (GtkTable *table, table->cols[i].shrink = 0; } - g_object_notify (G_OBJECT (table), "n_columns"); + g_object_notify (G_OBJECT (table), "n-columns"); } } } @@ -735,7 +735,7 @@ gtk_table_set_row_spacings (GtkTable *table, if (GTK_WIDGET_VISIBLE (table)) gtk_widget_queue_resize (GTK_WIDGET (table)); - g_object_notify (G_OBJECT (table), "row_spacing"); + g_object_notify (G_OBJECT (table), "row-spacing"); } /** @@ -771,7 +771,7 @@ gtk_table_set_col_spacings (GtkTable *table, if (GTK_WIDGET_VISIBLE (table)) gtk_widget_queue_resize (GTK_WIDGET (table)); - g_object_notify (G_OBJECT (table), "column_spacing"); + g_object_notify (G_OBJECT (table), "column-spacing"); } /** diff --git a/gtk/gtktearoffmenuitem.c b/gtk/gtktearoffmenuitem.c index 88a6a466f7..c68e48327d 100644 --- a/gtk/gtktearoffmenuitem.c +++ b/gtk/gtktearoffmenuitem.c @@ -157,7 +157,7 @@ gtk_tearoff_menu_item_paint (GtkWidget *widget, gint selected_shadow_type; gtk_widget_style_get (widget, - "selected_shadow_type", &selected_shadow_type, + "selected-shadow-type", &selected_shadow_type, NULL); gtk_paint_box (widget->style, widget->window, diff --git a/gtk/gtktextbuffer.c b/gtk/gtktextbuffer.c index 3cea28d37e..c706710218 100644 --- a/gtk/gtktextbuffer.c +++ b/gtk/gtktextbuffer.c @@ -426,7 +426,7 @@ gtk_text_buffer_new (GtkTextTagTable *table) { GtkTextBuffer *text_buffer; - text_buffer = g_object_new (GTK_TYPE_TEXT_BUFFER, "tag_table", table, NULL); + text_buffer = g_object_new (GTK_TYPE_TEXT_BUFFER, "tag-table", table, NULL); return text_buffer; } diff --git a/gtk/gtktexttag.c b/gtk/gtktexttag.c index 675629019b..996b2d5d0f 100644 --- a/gtk/gtktexttag.c +++ b/gtk/gtktexttag.c @@ -688,7 +688,7 @@ set_bg_color (GtkTextTag *tag, GdkColor *color) if (!tag->bg_color_set) { tag->bg_color_set = TRUE; - g_object_notify (G_OBJECT (tag), "background_set"); + g_object_notify (G_OBJECT (tag), "background-set"); } tag->values->appearance.bg_color = *color; @@ -698,7 +698,7 @@ set_bg_color (GtkTextTag *tag, GdkColor *color) if (tag->bg_color_set) { tag->bg_color_set = FALSE; - g_object_notify (G_OBJECT (tag), "background_set"); + g_object_notify (G_OBJECT (tag), "background-set"); } } } @@ -711,7 +711,7 @@ set_fg_color (GtkTextTag *tag, GdkColor *color) if (!tag->fg_color_set) { tag->fg_color_set = TRUE; - g_object_notify (G_OBJECT (tag), "foreground_set"); + g_object_notify (G_OBJECT (tag), "foreground-set"); } tag->values->appearance.fg_color = *color; } @@ -720,7 +720,7 @@ set_fg_color (GtkTextTag *tag, GdkColor *color) if (tag->fg_color_set) { tag->fg_color_set = FALSE; - g_object_notify (G_OBJECT (tag), "foreground_set"); + g_object_notify (G_OBJECT (tag), "foreground-set"); } } } @@ -792,17 +792,17 @@ notify_set_changed (GObject *object, PangoFontMask changed_mask) { if (changed_mask & PANGO_FONT_MASK_FAMILY) - g_object_notify (object, "family_set"); + g_object_notify (object, "family-set"); if (changed_mask & PANGO_FONT_MASK_STYLE) - g_object_notify (object, "style_set"); + g_object_notify (object, "style-set"); if (changed_mask & PANGO_FONT_MASK_VARIANT) - g_object_notify (object, "variant_set"); + g_object_notify (object, "variant-set"); if (changed_mask & PANGO_FONT_MASK_WEIGHT) - g_object_notify (object, "weight_set"); + g_object_notify (object, "weight-set"); if (changed_mask & PANGO_FONT_MASK_STRETCH) - g_object_notify (object, "stretch_set"); + g_object_notify (object, "stretch-set"); if (changed_mask & PANGO_FONT_MASK_SIZE) - g_object_notify (object, "size_set"); + g_object_notify (object, "size-set"); } static void @@ -852,7 +852,7 @@ set_font_description (GtkTextTag *text_tag, g_object_freeze_notify (object); - g_object_notify (object, "font_desc"); + g_object_notify (object, "font-desc"); g_object_notify (object, "font"); if (changed_mask & PANGO_FONT_MASK_FAMILY) @@ -868,7 +868,7 @@ set_font_description (GtkTextTag *text_tag, if (changed_mask & PANGO_FONT_MASK_SIZE) { g_object_notify (object, "size"); - g_object_notify (object, "size_points"); + g_object_notify (object, "size-points"); } notify_set_changed (object, set_changed_mask); @@ -912,7 +912,7 @@ gtk_text_tag_set_property (GObject *object, else g_warning ("Don't know color `%s'", g_value_get_string (value)); - g_object_notify (object, "background_gdk"); + g_object_notify (object, "background-gdk"); } break; @@ -925,7 +925,7 @@ gtk_text_tag_set_property (GObject *object, else g_warning ("Don't know color `%s'", g_value_get_string (value)); - g_object_notify (object, "foreground_gdk"); + g_object_notify (object, "foreground-gdk"); } break; @@ -950,7 +950,7 @@ gtk_text_tag_set_property (GObject *object, GdkBitmap *bitmap = g_value_get_object (value); text_tag->bg_stipple_set = TRUE; - g_object_notify (object, "background_stipple_set"); + g_object_notify (object, "background-stipple-set"); if (text_tag->values->appearance.bg_stipple != bitmap) { @@ -970,7 +970,7 @@ gtk_text_tag_set_property (GObject *object, GdkBitmap *bitmap = g_value_get_object (value); text_tag->fg_stipple_set = TRUE; - g_object_notify (object, "foreground_stipple_set"); + g_object_notify (object, "foreground-stipple-set"); if (text_tag->values->appearance.fg_stipple != bitmap) { @@ -1053,7 +1053,7 @@ gtk_text_tag_set_property (GObject *object, case PROP_SIZE: pango_font_description_set_size (text_tag->values->font, g_value_get_int (value)); - g_object_notify (object, "size_points"); + g_object_notify (object, "size-points"); break; case PROP_SIZE_POINTS: pango_font_description_set_size (text_tag->values->font, @@ -1064,7 +1064,7 @@ gtk_text_tag_set_property (GObject *object, size_changed = TRUE; notify_set_changed (object, old_set_mask & pango_font_description_get_set_fields (text_tag->values->font)); - g_object_notify (object, "font_desc"); + g_object_notify (object, "font-desc"); g_object_notify (object, "font"); break; @@ -1073,48 +1073,48 @@ gtk_text_tag_set_property (GObject *object, case PROP_SCALE: text_tag->values->font_scale = g_value_get_double (value); text_tag->scale_set = TRUE; - g_object_notify (object, "scale_set"); + g_object_notify (object, "scale-set"); size_changed = TRUE; break; case PROP_PIXELS_ABOVE_LINES: text_tag->pixels_above_lines_set = TRUE; text_tag->values->pixels_above_lines = g_value_get_int (value); - g_object_notify (object, "pixels_above_lines_set"); + g_object_notify (object, "pixels-above-lines-set"); size_changed = TRUE; break; case PROP_PIXELS_BELOW_LINES: text_tag->pixels_below_lines_set = TRUE; text_tag->values->pixels_below_lines = g_value_get_int (value); - g_object_notify (object, "pixels_below_lines_set"); + g_object_notify (object, "pixels-below-lines-set"); size_changed = TRUE; break; case PROP_PIXELS_INSIDE_WRAP: text_tag->pixels_inside_wrap_set = TRUE; text_tag->values->pixels_inside_wrap = g_value_get_int (value); - g_object_notify (object, "pixels_inside_wrap_set"); + g_object_notify (object, "pixels-inside-wrap-set"); size_changed = TRUE; break; case PROP_EDITABLE: text_tag->editable_set = TRUE; text_tag->values->editable = g_value_get_boolean (value); - g_object_notify (object, "editable_set"); + g_object_notify (object, "editable-set"); break; case PROP_WRAP_MODE: text_tag->wrap_mode_set = TRUE; text_tag->values->wrap_mode = g_value_get_enum (value); - g_object_notify (object, "wrap_mode_set"); + g_object_notify (object, "wrap-mode-set"); size_changed = TRUE; break; case PROP_JUSTIFICATION: text_tag->justification_set = TRUE; text_tag->values->justification = g_value_get_enum (value); - g_object_notify (object, "justification_set"); + g_object_notify (object, "justification-set"); size_changed = TRUE; break; @@ -1125,53 +1125,53 @@ gtk_text_tag_set_property (GObject *object, case PROP_LEFT_MARGIN: text_tag->left_margin_set = TRUE; text_tag->values->left_margin = g_value_get_int (value); - g_object_notify (object, "left_margin_set"); + g_object_notify (object, "left-margin-set"); size_changed = TRUE; break; case PROP_INDENT: text_tag->indent_set = TRUE; text_tag->values->indent = g_value_get_int (value); - g_object_notify (object, "indent_set"); + g_object_notify (object, "indent-set"); size_changed = TRUE; break; case PROP_STRIKETHROUGH: text_tag->strikethrough_set = TRUE; text_tag->values->appearance.strikethrough = g_value_get_boolean (value); - g_object_notify (object, "strikethrough_set"); + g_object_notify (object, "strikethrough-set"); break; case PROP_RIGHT_MARGIN: text_tag->right_margin_set = TRUE; text_tag->values->right_margin = g_value_get_int (value); - g_object_notify (object, "right_margin_set"); + g_object_notify (object, "right-margin-set"); size_changed = TRUE; break; case PROP_UNDERLINE: text_tag->underline_set = TRUE; text_tag->values->appearance.underline = g_value_get_enum (value); - g_object_notify (object, "underline_set"); + g_object_notify (object, "underline-set"); break; case PROP_RISE: text_tag->rise_set = TRUE; text_tag->values->appearance.rise = g_value_get_int (value); - g_object_notify (object, "rise_set"); + g_object_notify (object, "rise-set"); size_changed = TRUE; break; case PROP_BACKGROUND_FULL_HEIGHT: text_tag->bg_full_height_set = TRUE; text_tag->values->bg_full_height = g_value_get_boolean (value); - g_object_notify (object, "background_full_height_set"); + g_object_notify (object, "background-full-height-set"); break; case PROP_LANGUAGE: text_tag->language_set = TRUE; text_tag->values->language = pango_language_from_string (g_value_get_string (value)); - g_object_notify (object, "language_set"); + g_object_notify (object, "language-set"); break; case PROP_TABS: @@ -1184,7 +1184,7 @@ gtk_text_tag_set_property (GObject *object, text_tag->values->tabs = pango_tab_array_copy (g_value_get_boxed (value)); - g_object_notify (object, "tabs_set"); + g_object_notify (object, "tabs-set"); size_changed = TRUE; break; @@ -1193,7 +1193,7 @@ gtk_text_tag_set_property (GObject *object, g_warning ("The \"invisible\" property on GtkTextTag is not supported for GTK 2.0, it will be added in a future release. see http://bugzilla.gnome.org bug #66194 for status."); text_tag->invisible_set = TRUE; text_tag->values->invisible = g_value_get_boolean (value); - g_object_notify (object, "invisible_set"); + g_object_notify (object, "invisible-set"); size_changed = TRUE; break; diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c index a739bb7910..fe73071a21 100644 --- a/gtk/gtktextview.c +++ b/gtk/gtktextview.c @@ -1999,7 +1999,7 @@ gtk_text_view_set_wrap_mode (GtkTextView *text_view, } } - g_object_notify (G_OBJECT (text_view), "wrap_mode"); + g_object_notify (G_OBJECT (text_view), "wrap-mode"); } /** @@ -2090,7 +2090,7 @@ gtk_text_view_set_pixels_above_lines (GtkTextView *text_view, gtk_text_layout_default_style_changed (text_view->layout); } - g_object_notify (G_OBJECT (text_view), "pixels_above_lines"); + g_object_notify (G_OBJECT (text_view), "pixels-above-lines"); } } @@ -2136,7 +2136,7 @@ gtk_text_view_set_pixels_below_lines (GtkTextView *text_view, gtk_text_layout_default_style_changed (text_view->layout); } - g_object_notify (G_OBJECT (text_view), "pixels_below_lines"); + g_object_notify (G_OBJECT (text_view), "pixels-below-lines"); } } @@ -2182,7 +2182,7 @@ gtk_text_view_set_pixels_inside_wrap (GtkTextView *text_view, gtk_text_layout_default_style_changed (text_view->layout); } - g_object_notify (G_OBJECT (text_view), "pixels_inside_wrap"); + g_object_notify (G_OBJECT (text_view), "pixels-inside-wrap"); } } @@ -2273,7 +2273,7 @@ gtk_text_view_set_left_margin (GtkTextView *text_view, gtk_text_layout_default_style_changed (text_view->layout); } - g_object_notify (G_OBJECT (text_view), "left_margin"); + g_object_notify (G_OBJECT (text_view), "left-margin"); } } @@ -2319,7 +2319,7 @@ gtk_text_view_set_right_margin (GtkTextView *text_view, gtk_text_layout_default_style_changed (text_view->layout); } - g_object_notify (G_OBJECT (text_view), "right_margin"); + g_object_notify (G_OBJECT (text_view), "right-margin"); } } @@ -2471,7 +2471,7 @@ gtk_text_view_set_cursor_visible (GtkTextView *text_view, } } - g_object_notify (G_OBJECT (text_view), "cursor_visible"); + g_object_notify (G_OBJECT (text_view), "cursor-visible"); } } @@ -2757,8 +2757,8 @@ gtk_text_view_size_request (GtkWidget *widget, text_view = GTK_TEXT_VIEW (widget); gtk_widget_style_get (widget, - "interior_focus", &interior_focus, - "focus_line_width", &focus_width, + "interior-focus", &interior_focus, + "focus-line-width", &focus_width, NULL); if (interior_focus) @@ -3003,8 +3003,8 @@ gtk_text_view_size_allocate (GtkWidget *widget, */ gtk_widget_style_get (widget, - "interior_focus", &interior_focus, - "focus_line_width", &focus_width, + "interior-focus", &interior_focus, + "focus-line-width", &focus_width, NULL); if (interior_focus) @@ -4291,7 +4291,7 @@ gtk_text_view_draw_focus (GtkWidget *widget) /* We clear the focus if we are in interior focus mode. */ gtk_widget_style_get (widget, - "interior_focus", &interior_focus, + "interior-focus", &interior_focus, NULL); if (GTK_WIDGET_DRAWABLE (widget)) @@ -5338,7 +5338,7 @@ gtk_text_view_set_accepts_tab (GtkTextView *text_view, { text_view->accepts_tab = accepts_tab; - g_object_notify (G_OBJECT (text_view), "accepts_tab"); + g_object_notify (G_OBJECT (text_view), "accepts-tab"); } } diff --git a/gtk/gtktoggleaction.c b/gtk/gtktoggleaction.c index d6abd0cb1c..305be5b00a 100644 --- a/gtk/gtktoggleaction.c +++ b/gtk/gtktoggleaction.c @@ -180,7 +180,7 @@ gtk_toggle_action_new (const gchar *name, "name", name, "label", label, "tooltip", tooltip, - "stock_id", stock_id, + "stock-id", stock_id, NULL); return action; @@ -380,7 +380,7 @@ gtk_toggle_action_set_draw_as_radio (GtkToggleAction *action, { action->private_data->draw_as_radio = draw_as_radio; - g_object_notify (G_OBJECT (action), "draw_as_radio"); + g_object_notify (G_OBJECT (action), "draw-as-radio"); } } @@ -408,7 +408,7 @@ create_menu_item (GtkAction *action) GtkToggleAction *toggle_action = GTK_TOGGLE_ACTION (action); return g_object_new (GTK_TYPE_CHECK_MENU_ITEM, - "draw_as_radio", toggle_action->private_data->draw_as_radio, + "draw-as-radio", toggle_action->private_data->draw_as_radio, NULL); } diff --git a/gtk/gtktogglebutton.c b/gtk/gtktogglebutton.c index 5971d9359f..a51876d2be 100644 --- a/gtk/gtktogglebutton.c +++ b/gtk/gtktogglebutton.c @@ -197,7 +197,10 @@ gtk_toggle_button_new_with_label (const gchar *label) GtkWidget* gtk_toggle_button_new_with_mnemonic (const gchar *label) { - return g_object_new (GTK_TYPE_TOGGLE_BUTTON, "label", label, "use_underline", TRUE, NULL); + return g_object_new (GTK_TYPE_TOGGLE_BUTTON, + "label", label, + "use-underline", TRUE, + NULL); } static void @@ -287,7 +290,7 @@ gtk_toggle_button_set_mode (GtkToggleButton *toggle_button, if (GTK_WIDGET_VISIBLE (toggle_button)) gtk_widget_queue_resize (GTK_WIDGET (toggle_button)); - g_object_notify (G_OBJECT (toggle_button), "draw_indicator"); + g_object_notify (G_OBJECT (toggle_button), "draw-indicator"); } } diff --git a/gtk/gtktoggletoolbutton.c b/gtk/gtktoggletoolbutton.c index 0607d80ad5..e1d4461f92 100644 --- a/gtk/gtktoggletoolbutton.c +++ b/gtk/gtktoggletoolbutton.c @@ -288,7 +288,7 @@ gtk_toggle_tool_button_new_from_stock (const gchar *stock_id) g_return_val_if_fail (stock_id != NULL, NULL); button = g_object_new (GTK_TYPE_TOGGLE_TOOL_BUTTON, - "stock_id", stock_id, + "stock-id", stock_id, NULL); return GTK_TOOL_ITEM (button); diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c index 41ed31c9fc..cf08c009ed 100644 --- a/gtk/gtktoolbar.c +++ b/gtk/gtktoolbar.c @@ -2500,7 +2500,7 @@ gtk_toolbar_real_style_changed (GtkToolbar *toolbar, gtk_toolbar_reconfigured (toolbar); gtk_widget_queue_resize (GTK_WIDGET (toolbar)); - g_object_notify (G_OBJECT (toolbar), "toolbar_style"); + g_object_notify (G_OBJECT (toolbar), "toolbar-style"); } } @@ -2975,7 +2975,7 @@ gtk_toolbar_set_show_arrow (GtkToolbar *toolbar, gtk_widget_hide (priv->arrow_button); gtk_widget_queue_resize (GTK_WIDGET (toolbar)); - g_object_notify (G_OBJECT (toolbar), "show_arrow"); + g_object_notify (G_OBJECT (toolbar), "show-arrow"); } } @@ -4594,7 +4594,7 @@ get_space_size (GtkToolbar *toolbar) if (toolbar) { gtk_widget_style_get (GTK_WIDGET (toolbar), - "space_size", &space_size, + "space-size", &space_size, NULL); } @@ -4609,7 +4609,7 @@ get_space_style (GtkToolbar *toolbar) if (toolbar) { gtk_widget_style_get (GTK_WIDGET (toolbar), - "space_style", &space_style, + "space-style", &space_style, NULL); } @@ -4624,7 +4624,7 @@ get_button_relief (GtkToolbar *toolbar) gtk_widget_ensure_style (GTK_WIDGET (toolbar)); gtk_widget_style_get (GTK_WIDGET (toolbar), - "button_relief", &button_relief, + "button-relief", &button_relief, NULL); return button_relief; @@ -4636,7 +4636,7 @@ get_internal_padding (GtkToolbar *toolbar) gint ipadding = 0; gtk_widget_style_get (GTK_WIDGET (toolbar), - "internal_padding", &ipadding, + "internal-padding", &ipadding, NULL); return ipadding; @@ -4648,7 +4648,7 @@ get_shadow_type (GtkToolbar *toolbar) GtkShadowType shadow_type; gtk_widget_style_get (GTK_WIDGET (toolbar), - "shadow_type", &shadow_type, + "shadow-type", &shadow_type, NULL); return shadow_type; diff --git a/gtk/gtktoolbutton.c b/gtk/gtktoolbutton.c index 1c59bd1711..2281b643da 100644 --- a/gtk/gtktoolbutton.c +++ b/gtk/gtktoolbutton.c @@ -622,7 +622,7 @@ gtk_tool_button_new_from_stock (const gchar *stock_id) g_return_val_if_fail (stock_id != NULL, NULL); button = g_object_new (GTK_TYPE_TOOL_BUTTON, - "stock_id", stock_id, + "stock-id", stock_id, NULL); return GTK_TOOL_ITEM (button); @@ -740,7 +740,7 @@ gtk_tool_button_set_use_underline (GtkToolButton *button, gtk_tool_button_construct_contents (GTK_TOOL_ITEM (button)); - g_object_notify (G_OBJECT (button), "use_underline"); + g_object_notify (G_OBJECT (button), "use-underline"); } } @@ -788,7 +788,7 @@ gtk_tool_button_set_stock_id (GtkToolButton *button, button->priv->stock_id = g_strdup (stock_id); gtk_tool_button_construct_contents (GTK_TOOL_ITEM (button)); - g_object_notify (G_OBJECT (button), "stock_id"); + g_object_notify (G_OBJECT (button), "stock-id"); g_free (old_stock_id); } @@ -853,7 +853,7 @@ gtk_tool_button_set_icon_widget (GtkToolButton *button, gtk_tool_button_construct_contents (GTK_TOOL_ITEM (button)); - g_object_notify (G_OBJECT (button), "icon_widget"); + g_object_notify (G_OBJECT (button), "icon-widget"); } } @@ -900,7 +900,7 @@ gtk_tool_button_set_label_widget (GtkToolButton *button, gtk_tool_button_construct_contents (GTK_TOOL_ITEM (button)); - g_object_notify (G_OBJECT (button), "label_widget"); + g_object_notify (G_OBJECT (button), "label-widget"); } } diff --git a/gtk/gtktoolitem.c b/gtk/gtktoolitem.c index 1dede85af1..c2fcf4fff3 100644 --- a/gtk/gtktoolitem.c +++ b/gtk/gtktoolitem.c @@ -788,7 +788,7 @@ gtk_tool_item_set_is_important (GtkToolItem *tool_item, gboolean is_important) gtk_widget_queue_resize (GTK_WIDGET (tool_item)); - g_object_notify (G_OBJECT (tool_item), "is_important"); + g_object_notify (G_OBJECT (tool_item), "is-important"); } } @@ -915,7 +915,7 @@ gtk_tool_item_set_visible_horizontal (GtkToolItem *toolitem, { toolitem->priv->visible_horizontal = visible_horizontal; - g_object_notify (G_OBJECT (toolitem), "visible_horizontal"); + g_object_notify (G_OBJECT (toolitem), "visible-horizontal"); gtk_widget_queue_resize (GTK_WIDGET (toolitem)); } @@ -966,7 +966,7 @@ gtk_tool_item_set_visible_vertical (GtkToolItem *toolitem, { toolitem->priv->visible_vertical = visible_vertical; - g_object_notify (G_OBJECT (toolitem), "visible_vertical"); + g_object_notify (G_OBJECT (toolitem), "visible-vertical"); gtk_widget_queue_resize (GTK_WIDGET (toolitem)); } diff --git a/gtk/gtktreemodelfilter.c b/gtk/gtktreemodelfilter.c index a9516a4725..96eccfc052 100644 --- a/gtk/gtktreemodelfilter.c +++ b/gtk/gtktreemodelfilter.c @@ -2422,8 +2422,8 @@ gtk_tree_model_filter_new (GtkTreeModel *child_model, g_return_val_if_fail (GTK_IS_TREE_MODEL (child_model), NULL); retval = g_object_new (GTK_TYPE_TREE_MODEL_FILTER, - "child_model", child_model, - "virtual_root", root, + "child-model", child_model, + "virtual-root", root, NULL); return retval; diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 4ddcafd232..1085da00c5 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -2175,8 +2175,8 @@ gtk_tree_view_button_press (GtkWidget *widget, rtl = (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL); gtk_tree_view_stop_editing (tree_view, FALSE); gtk_widget_style_get (widget, - "vertical_separator", &vertical_separator, - "horizontal_separator", &horizontal_separator, + "vertical-separator", &vertical_separator, + "horizontal-separator", &horizontal_separator, NULL); @@ -3452,9 +3452,9 @@ gtk_tree_view_bin_expose (GtkWidget *widget, tree_view = GTK_TREE_VIEW (widget); gtk_widget_style_get (widget, - "horizontal_separator", &horizontal_separator, - "vertical_separator", &vertical_separator, - "allow_rules", &allow_rules, + "horizontal-separator", &horizontal_separator, + "vertical-separator", &vertical_separator, + "allow-rules", &allow_rules, "focus-line-width", &focus_line_width, NULL); @@ -4551,7 +4551,7 @@ validate_row (GtkTreeView *tree_view, gtk_widget_style_get (GTK_WIDGET (tree_view), "focus-padding", &focus_pad, - "horizontal_separator", &horizontal_separator, + "horizontal-separator", &horizontal_separator, NULL); for (list = tree_view->priv->columns; list; list = list->next) @@ -6463,7 +6463,7 @@ column_sizing_notify (GObject *object, if (gtk_tree_view_column_get_sizing (c) != GTK_TREE_VIEW_COLUMN_FIXED) /* disable fixed height mode */ - g_object_set (data, "fixed_height_mode", FALSE, NULL); + g_object_set (data, "fixed-height-mode", FALSE, NULL); } /** @@ -6798,7 +6798,7 @@ gtk_tree_view_style_set (GtkWidget *widget, } gtk_widget_style_get (widget, - "expander_size", &tree_view->priv->expander_size, + "expander-size", &tree_view->priv->expander_size, NULL); tree_view->priv->expander_size += EXPANDER_EXTRA_PADDING; @@ -7046,7 +7046,7 @@ gtk_tree_view_row_changed (GtkTreeModel *model, if (tree_view->priv->edited_column) gtk_tree_view_stop_editing (tree_view, TRUE); - gtk_widget_style_get (GTK_WIDGET (data), "vertical_separator", &vertical_separator, NULL); + gtk_widget_style_get (GTK_WIDGET (data), "vertical-separator", &vertical_separator, NULL); if (path == NULL) { @@ -7535,7 +7535,7 @@ gtk_tree_view_get_arrow_xrange (GtkTreeView *tree_view, } gtk_widget_style_get (GTK_WIDGET (tree_view), - "indent_expanders", &indent_expanders, + "indent-expanders", &indent_expanders, NULL); if (indent_expanders) @@ -7620,7 +7620,7 @@ gtk_tree_view_discover_dirty_iter (GtkTreeView *tree_view, gint horizontal_separator; gtk_widget_style_get (GTK_WIDGET (tree_view), - "horizontal_separator", &horizontal_separator, + "horizontal-separator", &horizontal_separator, NULL); if (height) @@ -8278,7 +8278,7 @@ gtk_tree_view_draw_arrow (GtkTreeView *tree_view, GtkExpanderStyle expander_style; gtk_widget_style_get (GTK_WIDGET (tree_view), - "vertical_separator", &vertical_separator, + "vertical-separator", &vertical_separator, NULL); expander_size = tree_view->priv->expander_size - EXPANDER_EXTRA_PADDING; @@ -8481,7 +8481,7 @@ gtk_tree_view_move_cursor_page_up_down (GtkTreeView *tree_view, /* This is sorta weird. Focus in should give us a cursor */ return; - gtk_widget_style_get (GTK_WIDGET (tree_view), "vertical_separator", &vertical_separator, NULL); + gtk_widget_style_get (GTK_WIDGET (tree_view), "vertical-separator", &vertical_separator, NULL); _gtk_tree_view_find_node (tree_view, cursor_path, &cursor_tree, &cursor_node); @@ -8890,7 +8890,7 @@ send_focus_change (GtkWidget *widget, gtk_widget_event (widget, fevent); - g_object_notify (G_OBJECT (widget), "has_focus"); + g_object_notify (G_OBJECT (widget), "has-focus"); g_object_unref (widget); gdk_event_free (fevent); @@ -9581,7 +9581,7 @@ gtk_tree_view_set_headers_visible (GtkTreeView *tree_view, gtk_widget_queue_resize (GTK_WIDGET (tree_view)); - g_object_notify (G_OBJECT (tree_view), "headers_visible"); + g_object_notify (G_OBJECT (tree_view), "headers-visible"); } /** @@ -9631,7 +9631,7 @@ gtk_tree_view_set_headers_clickable (GtkTreeView *tree_view, for (list = tree_view->priv->columns; list; list = list->next) gtk_tree_view_column_set_clickable (GTK_TREE_VIEW_COLUMN (list->data), setting); - g_object_notify (G_OBJECT (tree_view), "headers_clickable"); + g_object_notify (G_OBJECT (tree_view), "headers-clickable"); } @@ -9668,7 +9668,7 @@ gtk_tree_view_set_rules_hint (GtkTreeView *tree_view, gtk_widget_queue_draw (GTK_WIDGET (tree_view)); } - g_object_notify (G_OBJECT (tree_view), "rules_hint"); + g_object_notify (G_OBJECT (tree_view), "rules-hint"); } /** @@ -10068,7 +10068,7 @@ gtk_tree_view_set_expander_column (GtkTreeView *tree_view, } tree_view->priv->expander_column = column; - g_object_notify (G_OBJECT (tree_view), "expander_column"); + g_object_notify (G_OBJECT (tree_view), "expander-column"); } } @@ -11423,8 +11423,8 @@ gtk_tree_view_get_cell_area (GtkTreeView *tree_view, g_return_if_fail (GTK_WIDGET_REALIZED (tree_view)); gtk_widget_style_get (GTK_WIDGET (tree_view), - "vertical_separator", &vertical_separator, - "horizontal_separator", &horizontal_separator, + "vertical-separator", &vertical_separator, + "horizontal-separator", &horizontal_separator, NULL); rect->x = 0; @@ -12071,7 +12071,7 @@ gtk_tree_view_create_row_drag_icon (GtkTreeView *tree_view, cell_area = background_area; - gtk_widget_style_get (widget, "vertical_separator", &vertical_separator, NULL); + gtk_widget_style_get (widget, "vertical-separator", &vertical_separator, NULL); cell_area.y += vertical_separator / 2; cell_area.height -= vertical_separator; @@ -12167,7 +12167,7 @@ gtk_tree_view_set_enable_search (GtkTreeView *tree_view, if (tree_view->priv->enable_search != enable_search) { tree_view->priv->enable_search = enable_search; - g_object_notify (G_OBJECT (tree_view), "enable_search"); + g_object_notify (G_OBJECT (tree_view), "enable-search"); } } @@ -12224,7 +12224,7 @@ gtk_tree_view_set_search_column (GtkTreeView *tree_view, return; tree_view->priv->search_column = column; - g_object_notify (G_OBJECT (tree_view), "search_column"); + g_object_notify (G_OBJECT (tree_view), "search-column"); } /** diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c index 17c46f8782..cfa94d131a 100644 --- a/gtk/gtktreeviewcolumn.c +++ b/gtk/gtktreeviewcolumn.c @@ -1919,7 +1919,7 @@ gtk_tree_view_column_set_fixed_width (GtkTreeViewColumn *tree_column, gtk_widget_queue_resize (tree_column->tree_view); } - g_object_notify (G_OBJECT (tree_column), "fixed_width"); + g_object_notify (G_OBJECT (tree_column), "fixed-width"); } /** @@ -1970,9 +1970,9 @@ gtk_tree_view_column_set_min_width (GtkTreeViewColumn *tree_column, if (tree_column->max_width != -1 && tree_column->max_width < min_width) { tree_column->max_width = min_width; - g_object_notify (G_OBJECT (tree_column), "max_width"); + g_object_notify (G_OBJECT (tree_column), "max-width"); } - g_object_notify (G_OBJECT (tree_column), "min_width"); + g_object_notify (G_OBJECT (tree_column), "min-width"); g_object_thaw_notify (G_OBJECT (tree_column)); if (tree_column->column_type == GTK_TREE_VIEW_COLUMN_AUTOSIZE) @@ -2030,9 +2030,9 @@ gtk_tree_view_column_set_max_width (GtkTreeViewColumn *tree_column, if (max_width != -1 && max_width < tree_column->min_width) { tree_column->min_width = max_width; - g_object_notify (G_OBJECT (tree_column), "min_width"); + g_object_notify (G_OBJECT (tree_column), "min-width"); } - g_object_notify (G_OBJECT (tree_column), "max_width"); + g_object_notify (G_OBJECT (tree_column), "max-width"); g_object_thaw_notify (G_OBJECT (tree_column)); if (tree_column->column_type == GTK_TREE_VIEW_COLUMN_AUTOSIZE) @@ -2433,7 +2433,7 @@ gtk_tree_view_column_set_sort_indicator (GtkTreeViewColumn *tree_column, tree_column->show_sort_indicator = setting; gtk_tree_view_column_update_button (tree_column); - g_object_notify (G_OBJECT (tree_column), "sort_indicator"); + g_object_notify (G_OBJECT (tree_column), "sort-indicator"); } /** @@ -2480,7 +2480,7 @@ gtk_tree_view_column_set_sort_order (GtkTreeViewColumn *tree_column, tree_column->sort_order = order; gtk_tree_view_column_update_button (tree_column); - g_object_notify (G_OBJECT (tree_column), "sort_order"); + g_object_notify (G_OBJECT (tree_column), "sort-order"); } /** @@ -2538,10 +2538,10 @@ gtk_tree_view_column_cell_set_cell_data (GtkTreeViewColumn *tree_column, g_object_freeze_notify (cell); if (info->cell->is_expander != is_expander) - g_object_set (cell, "is_expander", is_expander, NULL); + g_object_set (cell, "is-expander", is_expander, NULL); if (info->cell->is_expanded != is_expanded) - g_object_set (cell, "is_expanded", is_expanded, NULL); + g_object_set (cell, "is-expanded", is_expanded, NULL); while (list && list->next) { diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c index dab5ffe45e..e3407e3c2a 100644 --- a/gtk/gtkuimanager.c +++ b/gtk/gtkuimanager.c @@ -576,7 +576,7 @@ gtk_ui_manager_set_add_tearoffs (GtkUIManager *self, dirty_all_nodes (self); - g_object_notify (G_OBJECT (self), "add_tearoffs"); + g_object_notify (G_OBJECT (self), "add-tearoffs"); } } diff --git a/gtk/gtkviewport.c b/gtk/gtkviewport.c index dbc958b7f2..c87da8b200 100644 --- a/gtk/gtkviewport.c +++ b/gtk/gtkviewport.c @@ -559,7 +559,7 @@ gtk_viewport_set_shadow_type (GtkViewport *viewport, gtk_widget_queue_draw (GTK_WIDGET (viewport)); } - g_object_notify (G_OBJECT (viewport), "shadow_type"); + g_object_notify (G_OBJECT (viewport), "shadow-type"); } } diff --git a/gtk/gtkvpaned.c b/gtk/gtkvpaned.c index d0472a6397..1943b92720 100644 --- a/gtk/gtkvpaned.c +++ b/gtk/gtkvpaned.c @@ -134,7 +134,7 @@ gtk_vpaned_size_request (GtkWidget *widget, { gint handle_size; - gtk_widget_style_get (widget, "handle_size", &handle_size, NULL); + gtk_widget_style_get (widget, "handle-size", &handle_size, NULL); requisition->height += handle_size; } } @@ -157,7 +157,7 @@ gtk_vpaned_size_allocate (GtkWidget *widget, GtkAllocation child2_allocation; gint handle_size; - gtk_widget_style_get (widget, "handle_size", &handle_size, NULL); + gtk_widget_style_get (widget, "handle-size", &handle_size, NULL); gtk_widget_get_child_requisition (paned->child1, &child1_requisition); gtk_widget_get_child_requisition (paned->child2, &child2_requisition); diff --git a/gtk/gtkvscale.c b/gtk/gtkvscale.c index cf43170699..dfb043fa6b 100644 --- a/gtk/gtkvscale.c +++ b/gtk/gtkvscale.c @@ -220,7 +220,7 @@ gtk_vscale_get_layout_offsets (GtkScale *scale, range = GTK_RANGE (widget); scale = GTK_SCALE (widget); - gtk_widget_style_get (widget, "value_spacing", &value_spacing, NULL); + gtk_widget_style_get (widget, "value-spacing", &value_spacing, NULL); pango_layout_get_pixel_extents (layout, NULL, &logical_rect); diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index 32a8b159b6..1d04d339e6 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -3936,7 +3936,7 @@ gtk_widget_grab_focus (GtkWidget *widget) g_object_ref (widget); g_signal_emit (widget, widget_signals[GRAB_FOCUS], 0); - g_object_notify (G_OBJECT (widget), "has_focus"); + g_object_notify (G_OBJECT (widget), "has-focus"); g_object_unref (widget); } @@ -4212,7 +4212,7 @@ gtk_widget_set_app_paintable (GtkWidget *widget, if (GTK_WIDGET_DRAWABLE (widget)) gtk_widget_queue_draw (widget); - g_object_notify (G_OBJECT (widget), "app_paintable"); + g_object_notify (G_OBJECT (widget), "app-paintable"); } } @@ -5591,13 +5591,13 @@ gtk_widget_set_usize_internal (GtkWidget *widget, if (width > -2 && aux_info->width != width) { - g_object_notify (G_OBJECT (widget), "width_request"); + g_object_notify (G_OBJECT (widget), "width-request"); aux_info->width = width; changed = TRUE; } if (height > -2 && aux_info->height != height) { - g_object_notify (G_OBJECT (widget), "height_request"); + g_object_notify (G_OBJECT (widget), "height-request"); aux_info->height = height; changed = TRUE; } @@ -5866,7 +5866,7 @@ gtk_widget_set_extension_events (GtkWidget *widget, *modep = mode; g_object_set_qdata (G_OBJECT (widget), quark_extension_event_mode, modep); - g_object_notify (G_OBJECT (widget), "extension_events"); + g_object_notify (G_OBJECT (widget), "extension-events"); } /** @@ -7607,7 +7607,7 @@ gtk_widget_set_no_show_all (GtkWidget *widget, else GTK_WIDGET_UNSET_FLAGS (widget, GTK_NO_SHOW_ALL); - g_object_notify (G_OBJECT (widget), "no_show_all"); + g_object_notify (G_OBJECT (widget), "no-show-all"); } #define __GTK_WIDGET_C__ diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index 811200f09a..26de8e3593 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -825,7 +825,7 @@ gtk_window_set_property (GObject *object, case PROP_RESIZABLE: window->allow_grow = g_value_get_boolean (value); gtk_widget_queue_resize (GTK_WIDGET (window)); - g_object_notify (G_OBJECT (window), "allow_grow"); + g_object_notify (G_OBJECT (window), "allow-grow"); break; case PROP_MODAL: gtk_window_set_modal (window, g_value_get_boolean (value)); @@ -1271,11 +1271,11 @@ gtk_window_set_default (GtkWindow *window, } if (old_default_widget) - g_object_notify (G_OBJECT (old_default_widget), "has_default"); + g_object_notify (G_OBJECT (old_default_widget), "has-default"); if (default_widget) { - g_object_notify (G_OBJECT (default_widget), "has_default"); + g_object_notify (G_OBJECT (default_widget), "has-default"); g_object_unref (default_widget); } } @@ -1293,8 +1293,8 @@ gtk_window_set_policy (GtkWindow *window, window->allow_grow = (allow_grow != FALSE); g_object_freeze_notify (G_OBJECT (window)); - g_object_notify (G_OBJECT (window), "allow_shrink"); - g_object_notify (G_OBJECT (window), "allow_grow"); + g_object_notify (G_OBJECT (window), "allow-shrink"); + g_object_notify (G_OBJECT (window), "allow-grow"); g_object_notify (G_OBJECT (window), "resizable"); g_object_thaw_notify (G_OBJECT (window)); @@ -1519,7 +1519,7 @@ gtk_window_set_position (GtkWindow *window, window->position = position; - g_object_notify (G_OBJECT (window), "window_position"); + g_object_notify (G_OBJECT (window), "window-position"); } /** @@ -1974,7 +1974,7 @@ gtk_window_set_skip_taskbar_hint (GtkWindow *window, if (GTK_WIDGET_REALIZED (window)) gdk_window_set_skip_taskbar_hint (GTK_WIDGET (window)->window, priv->skips_taskbar); - g_object_notify (G_OBJECT (window), "skip_taskbar_hint"); + g_object_notify (G_OBJECT (window), "skip-taskbar-hint"); } } @@ -2031,7 +2031,7 @@ gtk_window_set_skip_pager_hint (GtkWindow *window, if (GTK_WIDGET_REALIZED (window)) gdk_window_set_skip_pager_hint (GTK_WIDGET (window)->window, priv->skips_pager); - g_object_notify (G_OBJECT (window), "skip_pager_hint"); + g_object_notify (G_OBJECT (window), "skip-pager-hint"); } } @@ -2085,7 +2085,7 @@ gtk_window_set_accept_focus (GtkWindow *window, if (GTK_WIDGET_REALIZED (window)) gdk_window_set_accept_focus (GTK_WIDGET (window)->window, priv->accept_focus); - g_object_notify (G_OBJECT (window), "accept_focus"); + g_object_notify (G_OBJECT (window), "accept-focus"); } } @@ -2140,7 +2140,7 @@ gtk_window_set_focus_on_map (GtkWindow *window, if (GTK_WIDGET_REALIZED (window)) gdk_window_set_focus_on_map (GTK_WIDGET (window)->window, priv->focus_on_map); - g_object_notify (G_OBJECT (window), "focus_on_map"); + g_object_notify (G_OBJECT (window), "focus-on-map"); } } @@ -2197,7 +2197,7 @@ gtk_window_set_destroy_with_parent (GtkWindow *window, window->destroy_with_parent = setting; - g_object_notify (G_OBJECT (window), "destroy_with_parent"); + g_object_notify (G_OBJECT (window), "destroy-with-parent"); } /** @@ -2898,7 +2898,7 @@ gtk_window_set_icon_name (GtkWindow *window, update_themed_icon (NULL, window); - g_object_notify (G_OBJECT (window), "icon_name"); + g_object_notify (G_OBJECT (window), "icon-name"); } /** @@ -3210,7 +3210,7 @@ gtk_window_set_default_size_internal (GtkWindow *window, info->default_width = width; - g_object_notify (G_OBJECT (window), "default_width"); + g_object_notify (G_OBJECT (window), "default-width"); } if (change_height) @@ -3223,7 +3223,7 @@ gtk_window_set_default_size_internal (GtkWindow *window, info->default_height = height; - g_object_notify (G_OBJECT (window), "default_height"); + g_object_notify (G_OBJECT (window), "default-height"); } g_object_thaw_notify (G_OBJECT (window)); @@ -4540,7 +4540,7 @@ do_focus_change (GtkWidget *widget, gtk_widget_event (widget, fevent); - g_object_notify (G_OBJECT (widget), "has_focus"); + g_object_notify (G_OBJECT (widget), "has-focus"); g_object_unref (widget); gdk_event_free (fevent); @@ -4726,7 +4726,7 @@ gtk_window_real_set_focus (GtkWindow *window, if (window->has_focus) do_focus_change (old_focus, FALSE); - g_object_notify (G_OBJECT (old_focus), "is_focus"); + g_object_notify (G_OBJECT (old_focus), "is-focus"); } /* The above notifications may have set a new focus widget, @@ -4749,7 +4749,7 @@ gtk_window_real_set_focus (GtkWindow *window, if (window->has_focus) do_focus_change (window->focus_widget, TRUE); - g_object_notify (G_OBJECT (window->focus_widget), "is_focus"); + g_object_notify (G_OBJECT (window->focus_widget), "is-focus"); } /* If the default widget changed, a redraw will have been queued @@ -7412,7 +7412,7 @@ _gtk_window_set_is_active (GtkWindow *window, window->is_active = is_active; window_update_has_focus (window); - g_object_notify (G_OBJECT (window), "is_active"); + g_object_notify (G_OBJECT (window), "is-active"); } } @@ -7437,7 +7437,7 @@ _gtk_window_set_has_toplevel_focus (GtkWindow *window, window->has_toplevel_focus = has_toplevel_focus; window_update_has_focus (window); - g_object_notify (G_OBJECT (window), "has_toplevel_focus"); + g_object_notify (G_OBJECT (window), "has-toplevel-focus"); } } |