diff --git a/ChangeLog b/ChangeLog index cf59788b8d..87a9b28406 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-02-23 Matthias Clasen + + * gtk/gtktextiter.c: Fix macro declaration + + * gtk/gtkaboutdialog.c: Remove an accidentally included function. + 2006-02-22 Matthias Clasen * gtk/gtktextbtree.c: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index cf59788b8d..87a9b28406 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2006-02-23 Matthias Clasen + + * gtk/gtktextiter.c: Fix macro declaration + + * gtk/gtkaboutdialog.c: Remove an accidentally included function. + 2006-02-22 Matthias Clasen * gtk/gtktextbtree.c: diff --git a/gtk/gtkaboutdialog.c b/gtk/gtkaboutdialog.c index 92943962e6..5ab9b77cad 100644 --- a/gtk/gtkaboutdialog.c +++ b/gtk/gtkaboutdialog.c @@ -127,7 +127,6 @@ static void gtk_about_dialog_set_property (GObject GParamSpec *pspec); static void gtk_about_dialog_style_set (GtkWidget *widget, GtkStyle *previous_style); -static void gtk_about_dialog_close (GtkDialog *dialog); static void dialog_style_set (GtkWidget *widget, GtkStyle *previous_style, gpointer data); @@ -723,24 +722,6 @@ gtk_about_dialog_style_set (GtkWidget *widget, dialog_style_set (widget, previous_style, NULL); } -static void -gtk_about_dialog_close (GtkDialog *dialog) -{ - /* Synthesize delete_event to close dialog. */ - - GtkWidget *widget = GTK_WIDGET (dialog); - GdkEvent *event; - - event = gdk_event_new (GDK_DELETE); - - event->any.window = g_object_ref (widget->window); - event->any.send_event = TRUE; - - gtk_main_do_event (event); - gdk_event_free (event); -} - - /** * gtk_about_dialog_get_name: * @about: a #GtkAboutDialog diff --git a/gtk/gtktextiter.c b/gtk/gtktextiter.c index a757ad3c67..f233e6a288 100644 --- a/gtk/gtktextiter.c +++ b/gtk/gtktextiter.c @@ -395,7 +395,7 @@ check_invariants (const GtkTextIter *iter) _gtk_text_iter_check (iter); } #else -#define check_invariants (x) +#define check_invariants(x) #endif /**