More build fixes

20 files changed, 63 insertions, 60 deletions

diff --git a/ChangeLog b/ChangeLog
index 2666d93609..81c81d8514 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2005-04-06  Matthias Clasen  <mclasen@redhat.com>
 
-	* gtk/*.c, gdk/gdkdisplaymanager.c: s/G-OBJECT/G_OBJECT/g.
+	* gtk/*.c, gdk/gdkdisplaymanager.c: s/G-OBJECT/G_OBJECT/g, 
+	and some more build fixes.
 
 2005-04-06  Matthias Clasen  <mclasen@redhat.com>
 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2666d93609..81c81d8514 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,6 +1,7 @@
 2005-04-06  Matthias Clasen  <mclasen@redhat.com>
 
-	* gtk/*.c, gdk/gdkdisplaymanager.c: s/G-OBJECT/G_OBJECT/g.
+	* gtk/*.c, gdk/gdkdisplaymanager.c: s/G-OBJECT/G_OBJECT/g, 
+	and some more build fixes.
 
 2005-04-06  Matthias Clasen  <mclasen@redhat.com>
 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 2666d93609..81c81d8514 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,6 +1,7 @@
 2005-04-06  Matthias Clasen  <mclasen@redhat.com>
 
-	* gtk/*.c, gdk/gdkdisplaymanager.c: s/G-OBJECT/G_OBJECT/g.
+	* gtk/*.c, gdk/gdkdisplaymanager.c: s/G-OBJECT/G_OBJECT/g, 
+	and some more build fixes.
 
 2005-04-06  Matthias Clasen  <mclasen@redhat.com>
 
diff --git a/gtk/gtkaccellabel.c b/gtk/gtkaccellabel.c
index f4dd6bc43d..eee42b3cee 100644
--- a/gtk/gtkaccellabel.c
+++ b/gtk/gtkaccellabel.c
@@ -432,7 +432,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");
     }
 }
 
@@ -495,7 +495,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/gtkaspectframe.c b/gtk/gtkaspectframe.c
index f606922976..1a1eb6e1d0 100644
--- a/gtk/gtkaspectframe.c
+++ b/gtk/gtkaspectframe.c
@@ -276,7 +276,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/gtkcellview.c b/gtk/gtkcellview.c
index 8ed0ab4b04..2dcec11a96 100644
--- a/gtk/gtkcellview.c
+++ b/gtk/gtkcellview.c
@@ -1050,7 +1050,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;
@@ -1060,7 +1060,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/gtkcheckmenuitem.c b/gtk/gtkcheckmenuitem.c
index 1fc9797505..e76ba2057e 100644
--- a/gtk/gtkcheckmenuitem.c
+++ b/gtk/gtkcheckmenuitem.c
@@ -350,7 +350,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");
     }
 }
 
diff --git a/gtk/gtkcolorbutton.c b/gtk/gtkcolorbutton.c
index 681f7ae737..1743a15e03 100644
--- a/gtk/gtkcolorbutton.c
+++ b/gtk/gtkcolorbutton.c
@@ -883,7 +883,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/gtkcombobox.c b/gtk/gtkcombobox.c
index a5d4667260..f6254793c9 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -4214,7 +4214,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");
     }
 }
 
@@ -4264,7 +4264,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");
     }
 }
 
@@ -4314,7 +4314,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");
     }
 }
 
@@ -5024,7 +5024,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");
     }
 }
 
diff --git a/gtk/gtkfontbutton.c b/gtk/gtkfontbutton.c
index 12b19d01a4..c965a678d7 100644
--- a/gtk/gtkfontbutton.c
+++ b/gtk/gtkfontbutton.c
@@ -508,7 +508,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");
     }
 } 
 
@@ -554,7 +554,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");
     }
 } 
 
@@ -598,7 +598,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");
     }
 } 
 
@@ -648,7 +648,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");
     }
 } 
 
@@ -708,7 +708,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;
 }
@@ -769,7 +769,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/gtkhandlebox.c b/gtk/gtkhandlebox.c
index cac54263ec..3f77103fcd 100644
--- a/gtk/gtkhandlebox.c
+++ b/gtk/gtkhandlebox.c
@@ -807,7 +807,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));
     }
 }
@@ -838,7 +838,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));
     }
 }
@@ -871,8 +871,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/gtkiconview.c b/gtk/gtkiconview.c
index 6d6175ebb0..b8d253e579 100644
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -3148,7 +3148,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");
 }
 
 /**
@@ -3338,7 +3338,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");
 }
 
 /**
@@ -3397,7 +3397,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");
 }
 
 /**
@@ -3454,7 +3454,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/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index 2d177ff3ed..86b7561a12 100644
--- a/gtk/gtkscrolledwindow.c
+++ b/gtk/gtkscrolledwindow.c
@@ -552,7 +552,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");
     }
 }
 
@@ -598,7 +598,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");
     }
 }
 
diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c
index 927e54d45b..6ff0c550f0 100644
--- a/gtk/gtkspinbutton.c
+++ b/gtk/gtkspinbutton.c
@@ -1562,7 +1562,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));
 
@@ -1920,7 +1920,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");
     }
 }
 
@@ -2077,7 +2077,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/gtktextview.c b/gtk/gtktextview.c
index e654440dae..cf653ed07b 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");
     }
 }
 
@@ -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/gtktogglebutton.c b/gtk/gtktogglebutton.c
index b971e4a74e..d3b49bd444 100644
--- a/gtk/gtktogglebutton.c
+++ b/gtk/gtktogglebutton.c
@@ -286,7 +286,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/gtktoolitem.c b/gtk/gtktoolitem.c
index 56a1f54671..9248032dda 100644
--- a/gtk/gtktoolitem.c
+++ b/gtk/gtktoolitem.c
@@ -787,7 +787,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");
     }
 }
 
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 0d5a0f0a40..70a86de2de 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -9595,7 +9595,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");
 }
 
 /**
@@ -9645,7 +9645,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");
 }
 
 
@@ -9682,7 +9682,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");
 }
 
 /**
@@ -10082,7 +10082,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");
     }
 }
 
@@ -12152,7 +12152,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");
     }
 }
 
@@ -12215,7 +12215,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 a4d37799b9..3f5ffc32db 100644
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -1918,7 +1918,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");
 }
 
 /**
@@ -1969,9 +1969,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)
@@ -2029,9 +2029,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)
@@ -2432,7 +2432,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");
 }
 
 /**
@@ -2479,7 +2479,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");
 }
 
 /**
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 08e46d7ca3..a4cccffe91 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -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);
 	}
     }
@@ -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