summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--NEWS7
-rw-r--r--configure.ac2
-rw-r--r--plugins/gtk+/gtk+.xml.in11
4 files changed, 26 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index bbf35bf8..fe446c4b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-03-10 Tristan Van Berkom <tvb@gnome.org>
+
+ * NEWS, configure.ac: Rolling 3.4.3
+
+ * plugins/gtk+/gtk+.xml.in: Backing out GtkScaleButton
+ and GtkVolumeButton as they introduce strings.
+
+
2008-03-09 Tristan Van Berkom <tvb@gnome.org>
* NEWS, configure.ac: Rolling 3.4.2
diff --git a/NEWS b/NEWS
index 9c8c71dc..f675f7f7 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,11 @@
===========
+Glade 3.4.3
+===========
+ - Backed out GtkScaleButton and GtkVolumeButton since
+ they introduced strings.
+
+
+===========
Glade 3.4.2
===========
- Port to gtk 2.12 tooltips API. Bug #500947. - Christian Persch
diff --git a/configure.ac b/configure.ac
index 61423457..8d293a28 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ AC_PREREQ(2.52)
m4_define(glade_major_version, 3)
m4_define(glade_minor_version, 4)
-m4_define(glade_micro_version, 2)
+m4_define(glade_micro_version, 3)
m4_define(glade_version, glade_major_version.glade_minor_version.glade_micro_version)
AC_INIT([glade3], [glade_version],
diff --git a/plugins/gtk+/gtk+.xml.in b/plugins/gtk+/gtk+.xml.in
index 7f052b31..7b734590 100644
--- a/plugins/gtk+/gtk+.xml.in
+++ b/plugins/gtk+/gtk+.xml.in
@@ -778,6 +778,9 @@ embedded in another object</_tooltip>
</properties>
</glade-widget-class>
+
+ <!-- Commenting out new widgets untill string freeze is over
+
<glade-widget-class name="GtkScaleButton" generic-name="scalebutton" _title="Scale Button">
<properties>
<property id="size">
@@ -796,6 +799,8 @@ embedded in another object</_tooltip>
<glade-widget-class name="GtkVolumeButton" generic-name="volumebutton" _title="Volume Button"/>
+ -->
+
<glade-widget-class name="GtkFileChooserWidget" generic-name="filechooserwidget" _title="File Chooser Widget">
<post-create-function>glade_gtk_file_chooser_widget_post_create</post-create-function>
<properties>
@@ -1696,8 +1701,12 @@ embedded in another object</_tooltip>
<glade-widget-class-ref name="GtkColorButton"/>
<glade-widget-class-ref name="GtkFontButton"/>
<glade-widget-class-ref name="GtkLinkButton"/>
+
+
+ <!-- Commenting out these widgets until freeze is over
<glade-widget-class-ref name="GtkScaleButton"/>
- <glade-widget-class-ref name="GtkVolumeButton"/>
+ <glade-widget-class-ref name="GtkVolumeButton"/>\
+ -->
<glade-widget-class-ref name="GtkImage"/>
<glade-widget-class-ref name="GtkLabel"/>