summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJay Painter <jpaint@src.gnome.org>1997-12-04 08:00:59 +0000
committerJay Painter <jpaint@src.gnome.org>1997-12-04 08:00:59 +0000
commitef3f373172065c714fef8715e8cfc8656f8e7fd4 (patch)
tree80955f0f53398caabc09f83dfda8cbb01d7a078d
parent4b4c6aff9147aa2ef8c748bf14035e560264fa64 (diff)
downloadgtk+-ef3f373172065c714fef8715e8cfc8656f8e7fd4.tar.gz
Fixed recent bug in gtkstyle.c. -Jay
-rw-r--r--ChangeLog4
-rw-r--r--ChangeLog.pre-2-04
-rw-r--r--ChangeLog.pre-2-104
-rw-r--r--ChangeLog.pre-2-24
-rw-r--r--ChangeLog.pre-2-44
-rw-r--r--ChangeLog.pre-2-64
-rw-r--r--ChangeLog.pre-2-84
-rw-r--r--gtk/gtkstyle.c3
8 files changed, 30 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2548d34035..245a999cb0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Dec 3 1997 Jay Painter <jpaint@serv.net>
+ * gtk/gtkstyle.c: fixed a problem introduced recently in
+ gtk_style_detach witch crashed script_fu.
+
Wed Dec 3 1997 Owen Taylor <owt1@cornell.edu>
* gdk/Makefile.am: add a dependence for $(DEP_FILES) on
$(BUILT_SOURCES) to work around automake problem
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 2548d34035..245a999cb0 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,7 @@
+Wed Dec 3 1997 Jay Painter <jpaint@serv.net>
+ * gtk/gtkstyle.c: fixed a problem introduced recently in
+ gtk_style_detach witch crashed script_fu.
+
Wed Dec 3 1997 Owen Taylor <owt1@cornell.edu>
* gdk/Makefile.am: add a dependence for $(DEP_FILES) on
$(BUILT_SOURCES) to work around automake problem
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2548d34035..245a999cb0 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+Wed Dec 3 1997 Jay Painter <jpaint@serv.net>
+ * gtk/gtkstyle.c: fixed a problem introduced recently in
+ gtk_style_detach witch crashed script_fu.
+
Wed Dec 3 1997 Owen Taylor <owt1@cornell.edu>
* gdk/Makefile.am: add a dependence for $(DEP_FILES) on
$(BUILT_SOURCES) to work around automake problem
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 2548d34035..245a999cb0 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,7 @@
+Wed Dec 3 1997 Jay Painter <jpaint@serv.net>
+ * gtk/gtkstyle.c: fixed a problem introduced recently in
+ gtk_style_detach witch crashed script_fu.
+
Wed Dec 3 1997 Owen Taylor <owt1@cornell.edu>
* gdk/Makefile.am: add a dependence for $(DEP_FILES) on
$(BUILT_SOURCES) to work around automake problem
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 2548d34035..245a999cb0 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,7 @@
+Wed Dec 3 1997 Jay Painter <jpaint@serv.net>
+ * gtk/gtkstyle.c: fixed a problem introduced recently in
+ gtk_style_detach witch crashed script_fu.
+
Wed Dec 3 1997 Owen Taylor <owt1@cornell.edu>
* gdk/Makefile.am: add a dependence for $(DEP_FILES) on
$(BUILT_SOURCES) to work around automake problem
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 2548d34035..245a999cb0 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+Wed Dec 3 1997 Jay Painter <jpaint@serv.net>
+ * gtk/gtkstyle.c: fixed a problem introduced recently in
+ gtk_style_detach witch crashed script_fu.
+
Wed Dec 3 1997 Owen Taylor <owt1@cornell.edu>
* gdk/Makefile.am: add a dependence for $(DEP_FILES) on
$(BUILT_SOURCES) to work around automake problem
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 2548d34035..245a999cb0 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+Wed Dec 3 1997 Jay Painter <jpaint@serv.net>
+ * gtk/gtkstyle.c: fixed a problem introduced recently in
+ gtk_style_detach witch crashed script_fu.
+
Wed Dec 3 1997 Owen Taylor <owt1@cornell.edu>
* gdk/Makefile.am: add a dependence for $(DEP_FILES) on
$(BUILT_SOURCES) to work around automake problem
diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c
index 5f490c8a54..8cb2b12578 100644
--- a/gtk/gtkstyle.c
+++ b/gtk/gtkstyle.c
@@ -297,8 +297,9 @@ gtk_style_detach (GtkStyle *style)
style->depth = -1;
style->colormap = NULL;
- gtk_style_remove (style);
}
+
+ gtk_style_remove (style);
}
GtkStyle*