From 2cfa52b1ee7a0b154ed9d36f12c886c12074ebdf Mon Sep 17 00:00:00 2001 From: Manish Singh Date: Wed, 30 Jan 2002 23:35:08 +0000 Subject: [PATCH] remove unused variable. 2002-01-30 Manish Singh * gtk/gtkhandlebox.c (gtk_handle_box_destroy): remove unused variable. * gtk/gtkwindow.c (gtk_window_get_icon): function returns a value, so return NULL with g_return_val_if_fail instead of g_return_if_fail. --- ChangeLog | 8 ++++++++ ChangeLog.pre-2-0 | 8 ++++++++ ChangeLog.pre-2-10 | 8 ++++++++ ChangeLog.pre-2-2 | 8 ++++++++ ChangeLog.pre-2-4 | 8 ++++++++ ChangeLog.pre-2-6 | 8 ++++++++ ChangeLog.pre-2-8 | 8 ++++++++ gtk/gtkhandlebox.c | 2 -- gtk/gtkwindow.c | 2 +- 9 files changed, 57 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index edbc8181a8..2c7c839793 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2002-01-30 Manish Singh + + * gtk/gtkhandlebox.c (gtk_handle_box_destroy): remove unused + variable. + + * gtk/gtkwindow.c (gtk_window_get_icon): function returns a value, + so return NULL with g_return_val_if_fail instead of g_return_if_fail. + 2002-01-30 Matthias Clasen * gtk/*.c: Remove excess g_return_if_fail calls from static diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index edbc8181a8..2c7c839793 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,11 @@ +2002-01-30 Manish Singh + + * gtk/gtkhandlebox.c (gtk_handle_box_destroy): remove unused + variable. + + * gtk/gtkwindow.c (gtk_window_get_icon): function returns a value, + so return NULL with g_return_val_if_fail instead of g_return_if_fail. + 2002-01-30 Matthias Clasen * gtk/*.c: Remove excess g_return_if_fail calls from static diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index edbc8181a8..2c7c839793 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +2002-01-30 Manish Singh + + * gtk/gtkhandlebox.c (gtk_handle_box_destroy): remove unused + variable. + + * gtk/gtkwindow.c (gtk_window_get_icon): function returns a value, + so return NULL with g_return_val_if_fail instead of g_return_if_fail. + 2002-01-30 Matthias Clasen * gtk/*.c: Remove excess g_return_if_fail calls from static diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index edbc8181a8..2c7c839793 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,11 @@ +2002-01-30 Manish Singh + + * gtk/gtkhandlebox.c (gtk_handle_box_destroy): remove unused + variable. + + * gtk/gtkwindow.c (gtk_window_get_icon): function returns a value, + so return NULL with g_return_val_if_fail instead of g_return_if_fail. + 2002-01-30 Matthias Clasen * gtk/*.c: Remove excess g_return_if_fail calls from static diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index edbc8181a8..2c7c839793 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +2002-01-30 Manish Singh + + * gtk/gtkhandlebox.c (gtk_handle_box_destroy): remove unused + variable. + + * gtk/gtkwindow.c (gtk_window_get_icon): function returns a value, + so return NULL with g_return_val_if_fail instead of g_return_if_fail. + 2002-01-30 Matthias Clasen * gtk/*.c: Remove excess g_return_if_fail calls from static diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index edbc8181a8..2c7c839793 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +2002-01-30 Manish Singh + + * gtk/gtkhandlebox.c (gtk_handle_box_destroy): remove unused + variable. + + * gtk/gtkwindow.c (gtk_window_get_icon): function returns a value, + so return NULL with g_return_val_if_fail instead of g_return_if_fail. + 2002-01-30 Matthias Clasen * gtk/*.c: Remove excess g_return_if_fail calls from static diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index edbc8181a8..2c7c839793 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +2002-01-30 Manish Singh + + * gtk/gtkhandlebox.c (gtk_handle_box_destroy): remove unused + variable. + + * gtk/gtkwindow.c (gtk_window_get_icon): function returns a value, + so return NULL with g_return_val_if_fail instead of g_return_if_fail. + 2002-01-30 Matthias Clasen * gtk/*.c: Remove excess g_return_if_fail calls from static diff --git a/gtk/gtkhandlebox.c b/gtk/gtkhandlebox.c index 729c9aafd0..696e5bd2cd 100644 --- a/gtk/gtkhandlebox.c +++ b/gtk/gtkhandlebox.c @@ -328,8 +328,6 @@ gtk_handle_box_new (void) static void gtk_handle_box_destroy (GtkObject *object) { - GtkHandleBox *hb = GTK_HANDLE_BOX (object); - if (GTK_OBJECT_CLASS (parent_class)->destroy) (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); } diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index 23bef62604..cddb2777dc 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -2251,7 +2251,7 @@ gtk_window_get_icon (GtkWindow *window) { GtkWindowIconInfo *info; - g_return_if_fail (GTK_IS_WINDOW (window)); + g_return_val_if_fail (GTK_IS_WINDOW (window), NULL); info = get_icon_info (window); if (info && info->icon_list)