summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog16
-rw-r--r--NEWS17
-rw-r--r--configure.ac4
-rw-r--r--gladeui/glade-editor.h7
-rw-r--r--gladeui/glade-project.h3
-rw-r--r--gladeui/glade-signal-editor.h22
-rw-r--r--gladeui/glade-utils.h4
-rw-r--r--plugins/gtk+/glade-button-editor.c2
-rw-r--r--plugins/gtk+/glade-gtk.c4
-rw-r--r--plugins/gtk+/glade-store-editor.c50
10 files changed, 75 insertions, 54 deletions
diff --git a/ChangeLog b/ChangeLog
index 666024b2..0e7a2af8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2009-04-06 Tristan Van Berkom <tvb@gnome.org>
+
+ * plugins/gtk+/glade-button-editor.c: Properly initialize GValue on
+ stack (fix by Felix Riemann - bug 577822).
+
+ * plugins/gtk+/glade-gtk.c, plugins/gtk+/glade-store-editor.c:
+ Disabled 'data' property for treestores (oops not supported by
+ GtkBuilder, Bug 577685).
+
+ * gladeui/[...].h: Fixed failed build on Msys/MinGW (Bug 576851 –
+ fix by Damon Register).
+
2009-03-25 Tristan Van Berkom <tvb@gnome.org>
Fixed Mal-ordering of atk properties, signals and accelerators in
@@ -11,7 +23,9 @@
in libglade format, leave signals to core when in builder format.
2009-03-21 Tristan Van Berkom <tvb@gnome.org>
-
+
+ * NEWS, configure.ac: Rolling 3.6.1
+
* gladeui/glade-command.c: Fix win32 crasher (bug 575206) again (seems
I missed it was klass->name that was null, fixed it so it would never
be null, and added g_assert() where the crash was.
diff --git a/NEWS b/NEWS
index b5c10237..2af2b108 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,21 @@
===========
+Glade 3.6.1
+===========
+ - Fixed win32 crasher (bug 575206)
+ - Fixed crasher on internal widget selection
+ - Fixed libglade regression (libglade needs specific
+ ordering of properties, atk props, signals and accelerators)
+ - Fixed MSYS/MinGW build (Bug 576851 – Damon Register)
+ - Disable loading and displaying of 'data' property on GtkTreeStore
+ (only GtkListStore understands the 'data' construct).
+ - Properly initialize a GValue on stack (bug 577822 - Felix Riemann)
+
+New and updated translations
+============================
+ - Petr Kovar, Andre Klapper (cs)
+ - Djihed Afifi (ar)
+
+===========
Glade 3.6.0
===========
- Fixed bugs 574260, 573513, 573453, 574706, 567809 (Juan Pablo Ugarte, Ryu Jinno, myself)
diff --git a/configure.ac b/configure.ac
index 6330e073..f2b42544 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, 6)
-m4_define(glade_micro_version, 0)
+m4_define(glade_micro_version, 1)
m4_define(glade_version, glade_major_version.glade_minor_version.glade_micro_version)
AC_INIT([glade3], [glade_version],
@@ -47,7 +47,7 @@ AM_PROG_LIBTOOL
# If any interfaces have been added since the last public release, then increment GLADE_AGE.
# If any interfaces have been removed since the last public release, then set GLADE_AGE to 0.
# Reference: http://www.gnu.org/software/libtool/manual.html#Versioning
-GLADE_REVISION=2
+GLADE_REVISION=3
GLADE_CURRENT=9
GLADE_AGE=0
GLADE_CURRENT_MINUS_AGE=`expr $GLADE_CURRENT - $GLADE_AGE`
diff --git a/gladeui/glade-editor.h b/gladeui/glade-editor.h
index 4f7e3230..a3f6fe3f 100644
--- a/gladeui/glade-editor.h
+++ b/gladeui/glade-editor.h
@@ -107,9 +107,6 @@ struct _GladeEditor
gboolean show_info; /* Whether or not to show an informational button
*/
- gboolean show_context_info; /* Whether or not to show an informational
- * button for each property and signal.
- */
};
struct _GladeEditorClass
@@ -144,12 +141,8 @@ gboolean glade_editor_query_dialog (GladeEditor *editor,
void glade_editor_show_info (GladeEditor *editor);
-void glade_editor_show_context_info (GladeEditor *editor);
-
void glade_editor_hide_info (GladeEditor *editor);
-void glade_editor_hide_context_info (GladeEditor *editor);
-
void glade_editor_search_doc_search (GladeEditor *editor,
const gchar *book,
const gchar *page,
diff --git a/gladeui/glade-project.h b/gladeui/glade-project.h
index 1181e277..8e6b00a4 100644
--- a/gladeui/glade-project.h
+++ b/gladeui/glade-project.h
@@ -179,9 +179,6 @@ gchar *glade_project_verify_widget_adaptor (GladeProject *project,
void glade_project_verify_project_for_ui (GladeProject *project);
-gboolean glade_project_is_loaded_factory_file (GladeProject *project,
- const gchar *stock_id);
-
GList *glade_project_required_libs (GladeProject *project);
void glade_project_set_naming_policy (GladeProject *project,
diff --git a/gladeui/glade-signal-editor.h b/gladeui/glade-signal-editor.h
index f9d12e6f..9cb6b0fb 100644
--- a/gladeui/glade-signal-editor.h
+++ b/gladeui/glade-signal-editor.h
@@ -97,18 +97,16 @@ GtkWidget *glade_signal_editor_get_widget (GladeSignalEditor *editor);
void glade_signal_editor_load_widget (GladeSignalEditor *editor, GladeWidget *widget);
-gboolean
-glade_signal_editor_handler_editing_started_default_impl (GladeSignalEditor *editor,
- gchar *signal_name,
- GtkTreeIter *iter,
- GtkCellEditable *editable,
- gpointer user_data);
-gboolean
-glade_signal_editor_userdata_editing_started_default_impl (GladeSignalEditor *editor,
- gchar *signal_name,
- GtkTreeIter *iter,
- GtkCellEditable *editable,
- gpointer user_data);
+gboolean glade_signal_editor_handler_editing_started_default_impl (GladeSignalEditor *editor,
+ gchar *signal_name,
+ GtkTreeIter *iter,
+ GtkCellEditable *editable,
+ gpointer user_data);
+gboolean glade_signal_editor_userdata_editing_started_default_impl (GladeSignalEditor *editor,
+ gchar *signal_name,
+ GtkTreeIter *iter,
+ GtkCellEditable *editable,
+ gpointer user_data);
G_END_DECLS
diff --git a/gladeui/glade-utils.h b/gladeui/glade-utils.h
index 233c8987..f7d314b8 100644
--- a/gladeui/glade-utils.h
+++ b/gladeui/glade-utils.h
@@ -125,10 +125,6 @@ gboolean glade_util_url_show (const gchar *url);
time_t glade_util_get_file_mtime (const gchar *filename, GError **error);
-
-gboolean glade_util_version_lesser_than (gdouble a, gdouble b);
-
-
gchar *glade_util_filename_to_icon_name (const gchar *value);
gchar *glade_util_icon_name_to_filename (const gchar *value);
diff --git a/plugins/gtk+/glade-button-editor.c b/plugins/gtk+/glade-button-editor.c
index 06d7da7f..17cb50d7 100644
--- a/plugins/gtk+/glade-button-editor.c
+++ b/plugins/gtk+/glade-button-editor.c
@@ -223,7 +223,7 @@ standard_toggled (GtkWidget *widget,
GladeProperty *property;
GladeWidget *gchild = NULL;
GtkWidget *child, *button;
- GValue value;
+ GValue value = { 0, };
gboolean use_appearance = FALSE;
if (button_editor->loading || !button_editor->loaded_widget)
diff --git a/plugins/gtk+/glade-gtk.c b/plugins/gtk+/glade-gtk.c
index 2efd230a..966a433c 100644
--- a/plugins/gtk+/glade-gtk.c
+++ b/plugins/gtk+/glade-gtk.c
@@ -10169,7 +10169,9 @@ glade_gtk_store_read_widget (GladeWidgetAdaptor *adaptor,
GWA_GET_CLASS (G_TYPE_OBJECT)->read_widget (adaptor, widget, node);
glade_gtk_store_read_columns (widget, node);
- glade_gtk_store_read_data (widget, node);
+
+ if (GTK_IS_LIST_STORE (widget->object))
+ glade_gtk_store_read_data (widget, node);
}
/*--------------------------- GtkCellRenderer ---------------------------------*/
diff --git a/plugins/gtk+/glade-store-editor.c b/plugins/gtk+/glade-store-editor.c
index d47996d9..8b5ad0cf 100644
--- a/plugins/gtk+/glade-store-editor.c
+++ b/plugins/gtk+/glade-store-editor.c
@@ -204,29 +204,33 @@ glade_store_editor_new (GladeWidgetAdaptor *adaptor,
gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (eprop), FALSE, FALSE, 4);
- /* -------------- The data area here -------------- */
- /* Label item in frame label widget on top.. */
- eprop = glade_widget_adaptor_create_eprop_by_name (adaptor, "data", FALSE, TRUE);
- store_editor->properties = g_list_prepend (store_editor->properties, eprop);
- frame = gtk_frame_new (NULL);
- gtk_frame_set_label_widget (GTK_FRAME (frame), eprop->item_label);
- gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE);
- gtk_box_pack_start (GTK_BOX (store_editor), frame, FALSE, FALSE, 12);
-
- /* Alignment/Vbox in frame... */
- alignment = gtk_alignment_new (0.5F, 0.5F, 1.0F, 1.0F);
- gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 6, 0, 12, 0);
- gtk_container_add (GTK_CONTAINER (frame), alignment);
- vbox = gtk_vbox_new (FALSE, 0);
- gtk_container_add (GTK_CONTAINER (alignment), vbox);
-
- /* Add descriptive label */
- label = gtk_label_new (_("Add remove and edit rows of data (you can optionally use CNTL-N to add "
- "new rows and the Delete key to remove the selected row)"));
- gtk_label_set_line_wrap (GTK_LABEL(label), TRUE);
- gtk_label_set_line_wrap_mode (GTK_LABEL(label), PANGO_WRAP_WORD);
- gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 6);
- gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (eprop), FALSE, FALSE, 4);
+ if (adaptor->type == GTK_TYPE_LIST_STORE ||
+ g_type_is_a (adaptor->type, GTK_TYPE_LIST_STORE))
+ {
+ /* -------------- The data area here -------------- */
+ /* Label item in frame label widget on top.. */
+ eprop = glade_widget_adaptor_create_eprop_by_name (adaptor, "data", FALSE, TRUE);
+ store_editor->properties = g_list_prepend (store_editor->properties, eprop);
+ frame = gtk_frame_new (NULL);
+ gtk_frame_set_label_widget (GTK_FRAME (frame), eprop->item_label);
+ gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE);
+ gtk_box_pack_start (GTK_BOX (store_editor), frame, FALSE, FALSE, 12);
+
+ /* Alignment/Vbox in frame... */
+ alignment = gtk_alignment_new (0.5F, 0.5F, 1.0F, 1.0F);
+ gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 6, 0, 12, 0);
+ gtk_container_add (GTK_CONTAINER (frame), alignment);
+ vbox = gtk_vbox_new (FALSE, 0);
+ gtk_container_add (GTK_CONTAINER (alignment), vbox);
+
+ /* Add descriptive label */
+ label = gtk_label_new (_("Add remove and edit rows of data (you can optionally use CNTL-N to add "
+ "new rows and the Delete key to remove the selected row)"));
+ gtk_label_set_line_wrap (GTK_LABEL(label), TRUE);
+ gtk_label_set_line_wrap_mode (GTK_LABEL(label), PANGO_WRAP_WORD);
+ gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 6);
+ gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (eprop), FALSE, FALSE, 4);
+ }
gtk_widget_show_all (GTK_WIDGET (store_editor));
View Lorry Controller Status