only unref those handlers that have not yet been disconnected (finally

Mon Oct 12 07:51:34 1998  Tim Janik  <timj@gtk.org>

        * gtk/gtksignal.c (gtk_signal_handlers_destroy): only unref those
        handlers that have not yet been disconnected (finally managed to
        trigger the gtk_signal_handler_unref() paranoid warning).

Sat Oct 10 03:37:50 1998  Tim Janik  <timj@gtk.org>

        * gtk/gtkwidget.c (gtk_widget_get_arg): fixed default value for x, y,
        width and height which is -1 and not -2.

9 files changed, 85 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index b123a60b7..0ab1dcab2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Mon Oct 12 07:51:34 1998  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtksignal.c (gtk_signal_handlers_destroy): only unref those
+ 	handlers that have not yet been disconnected (finally managed to
+	trigger the gtk_signal_handler_unref() paranoid warning).
+
+Sat Oct 10 03:37:50 1998  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtkwidget.c (gtk_widget_get_arg): fixed default value for x, y,
+	width and height which is -1 and not -2.
+
 Sat Oct 10 00:50:53 PDT 1998 Manish Singh <yosh@gimp.org>
 
 	* HACKING
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index b123a60b7..0ab1dcab2 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,14 @@
+Mon Oct 12 07:51:34 1998  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtksignal.c (gtk_signal_handlers_destroy): only unref those
+ 	handlers that have not yet been disconnected (finally managed to
+	trigger the gtk_signal_handler_unref() paranoid warning).
+
+Sat Oct 10 03:37:50 1998  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtkwidget.c (gtk_widget_get_arg): fixed default value for x, y,
+	width and height which is -1 and not -2.
+
 Sat Oct 10 00:50:53 PDT 1998 Manish Singh <yosh@gimp.org>
 
 	* HACKING
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b123a60b7..0ab1dcab2 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,14 @@
+Mon Oct 12 07:51:34 1998  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtksignal.c (gtk_signal_handlers_destroy): only unref those
+ 	handlers that have not yet been disconnected (finally managed to
+	trigger the gtk_signal_handler_unref() paranoid warning).
+
+Sat Oct 10 03:37:50 1998  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtkwidget.c (gtk_widget_get_arg): fixed default value for x, y,
+	width and height which is -1 and not -2.
+
 Sat Oct 10 00:50:53 PDT 1998 Manish Singh <yosh@gimp.org>
 
 	* HACKING
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index b123a60b7..0ab1dcab2 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,14 @@
+Mon Oct 12 07:51:34 1998  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtksignal.c (gtk_signal_handlers_destroy): only unref those
+ 	handlers that have not yet been disconnected (finally managed to
+	trigger the gtk_signal_handler_unref() paranoid warning).
+
+Sat Oct 10 03:37:50 1998  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtkwidget.c (gtk_widget_get_arg): fixed default value for x, y,
+	width and height which is -1 and not -2.
+
 Sat Oct 10 00:50:53 PDT 1998 Manish Singh <yosh@gimp.org>
 
 	* HACKING
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index b123a60b7..0ab1dcab2 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,14 @@
+Mon Oct 12 07:51:34 1998  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtksignal.c (gtk_signal_handlers_destroy): only unref those
+ 	handlers that have not yet been disconnected (finally managed to
+	trigger the gtk_signal_handler_unref() paranoid warning).
+
+Sat Oct 10 03:37:50 1998  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtkwidget.c (gtk_widget_get_arg): fixed default value for x, y,
+	width and height which is -1 and not -2.
+
 Sat Oct 10 00:50:53 PDT 1998 Manish Singh <yosh@gimp.org>
 
 	* HACKING
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index b123a60b7..0ab1dcab2 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,14 @@
+Mon Oct 12 07:51:34 1998  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtksignal.c (gtk_signal_handlers_destroy): only unref those
+ 	handlers that have not yet been disconnected (finally managed to
+	trigger the gtk_signal_handler_unref() paranoid warning).
+
+Sat Oct 10 03:37:50 1998  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtkwidget.c (gtk_widget_get_arg): fixed default value for x, y,
+	width and height which is -1 and not -2.
+
 Sat Oct 10 00:50:53 PDT 1998 Manish Singh <yosh@gimp.org>
 
 	* HACKING
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index b123a60b7..0ab1dcab2 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,14 @@
+Mon Oct 12 07:51:34 1998  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtksignal.c (gtk_signal_handlers_destroy): only unref those
+ 	handlers that have not yet been disconnected (finally managed to
+	trigger the gtk_signal_handler_unref() paranoid warning).
+
+Sat Oct 10 03:37:50 1998  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtkwidget.c (gtk_widget_get_arg): fixed default value for x, y,
+	width and height which is -1 and not -2.
+
 Sat Oct 10 00:50:53 PDT 1998 Manish Singh <yosh@gimp.org>
 
 	* HACKING
diff --git a/gtk/gtksignal.c b/gtk/gtksignal.c
index f87f33701..a35840f65 100644
--- a/gtk/gtksignal.c
+++ b/gtk/gtksignal.c
@@ -1151,11 +1151,13 @@ gtk_signal_handlers_destroy (GtkObject *object)
 	  GtkHandler *next;
 	  
 	  next = handler->next;
-	  gtk_signal_handler_unref (handler, object);
+	  if (handler->id > 0)
+	    gtk_signal_handler_unref (handler, object);
 	  handler = next;
 	}
       handler = gtk_object_get_data_by_id (object, handler_quark);
-      gtk_signal_handler_unref (handler, object);
+      if (handler->id > 0)
+	gtk_signal_handler_unref (handler, object);
     }
 }
 
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 40055f249..6871d48a4 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -839,28 +839,28 @@ gtk_widget_get_arg (GtkObject   *object,
     case ARG_X:
       aux_info = gtk_object_get_data_by_id (GTK_OBJECT (widget), aux_info_key_id);
       if (!aux_info)
-	GTK_VALUE_INT (*arg) = -2;
+	GTK_VALUE_INT (*arg) = -1;
       else
 	GTK_VALUE_INT (*arg) = aux_info->x;
       break;
     case ARG_Y:
       aux_info = gtk_object_get_data_by_id (GTK_OBJECT (widget), aux_info_key_id);
       if (!aux_info)
-	GTK_VALUE_INT (*arg) = -2;
+	GTK_VALUE_INT (*arg) = -1;
       else
 	GTK_VALUE_INT (*arg) = aux_info->y;
       break;
     case ARG_WIDTH:
       aux_info = gtk_object_get_data_by_id (GTK_OBJECT (widget), aux_info_key_id);
       if (!aux_info)
-	GTK_VALUE_INT (*arg) = -2;
+	GTK_VALUE_INT (*arg) = -1;
       else
 	GTK_VALUE_INT (*arg) = aux_info->width;
       break;
     case ARG_HEIGHT:
       aux_info = gtk_object_get_data_by_id (GTK_OBJECT (widget), aux_info_key_id);
       if (!aux_info)
-	GTK_VALUE_INT (*arg) = -2;
+	GTK_VALUE_INT (*arg) = -1;
       else
 	GTK_VALUE_INT (*arg) = aux_info->height;
       break;