remove unused variable.

2002-01-30  Manish Singh  <yosh@gimp.org>

        * 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.

diff --git a/ChangeLog b/ChangeLog
index edbc8181a8b75d19cf5bb2bc6307d2d390c69276..2c7c83979329c7fea418b4c4665eef3723415027 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-01-30  Manish Singh  <yosh@gimp.org>
+
+       * 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  <matthiasc@poet.de>
 
        * gtk/*.c: Remove excess g_return_if_fail calls from static

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index edbc8181a8b75d19cf5bb2bc6307d2d390c69276..2c7c83979329c7fea418b4c4665eef3723415027 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,11 @@
+2002-01-30  Manish Singh  <yosh@gimp.org>
+
+       * 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  <matthiasc@poet.de>
 
        * gtk/*.c: Remove excess g_return_if_fail calls from static

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index edbc8181a8b75d19cf5bb2bc6307d2d390c69276..2c7c83979329c7fea418b4c4665eef3723415027 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2002-01-30  Manish Singh  <yosh@gimp.org>
+
+       * 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  <matthiasc@poet.de>
 
        * gtk/*.c: Remove excess g_return_if_fail calls from static

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index edbc8181a8b75d19cf5bb2bc6307d2d390c69276..2c7c83979329c7fea418b4c4665eef3723415027 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+2002-01-30  Manish Singh  <yosh@gimp.org>
+
+       * 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  <matthiasc@poet.de>
 
        * gtk/*.c: Remove excess g_return_if_fail calls from static

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index edbc8181a8b75d19cf5bb2bc6307d2d390c69276..2c7c83979329c7fea418b4c4665eef3723415027 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+2002-01-30  Manish Singh  <yosh@gimp.org>
+
+       * 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  <matthiasc@poet.de>
 
        * gtk/*.c: Remove excess g_return_if_fail calls from static

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index edbc8181a8b75d19cf5bb2bc6307d2d390c69276..2c7c83979329c7fea418b4c4665eef3723415027 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+2002-01-30  Manish Singh  <yosh@gimp.org>
+
+       * 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  <matthiasc@poet.de>
 
        * gtk/*.c: Remove excess g_return_if_fail calls from static

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index edbc8181a8b75d19cf5bb2bc6307d2d390c69276..2c7c83979329c7fea418b4c4665eef3723415027 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+2002-01-30  Manish Singh  <yosh@gimp.org>
+
+       * 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  <matthiasc@poet.de>
 
        * gtk/*.c: Remove excess g_return_if_fail calls from static

diff --git a/gtk/gtkhandlebox.c b/gtk/gtkhandlebox.c
index 729c9aafd0e997823afc105e00dec4db8b1b8aeb..696e5bd2cd400e4e598b049c3f9029c575f59901 100644 (file)
--- 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 23bef62604cf052a0b56d1ca2758c6af024e7a1e..cddb2777dc2044b60ead536f7b2c4a631f2630ae 100644 (file)
--- 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)