[glade3/signal-tree-model: 103/103] Merge branch 'master' into signal-tree-model
- From: Johannes Schmid <jhs src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glade3/signal-tree-model: 103/103] Merge branch 'master' into signal-tree-model
- Date: Thu, 30 Dec 2010 13:04:58 +0000 (UTC)
commit 6ca40fca15804d21d7573ffed50b8dfb8a13f194
Merge: 7cd0289 32a8d1e
Author: Johannes Schmid <jhs gnome org>
Date: Thu Dec 30 14:04:23 2010 +0100
Merge branch 'master' into signal-tree-model
Conflicts:
gladeui/glade-project.c
gladeui/glade-widget.c
ChangeLog | 265 ++
configure.ac | 37 +-
data/Makefile.am | 6 +-
.../{glade-3.desktop.in.in => glade.desktop.in.in} | 0
data/{gladeui-1.0.pc.in => gladeui-2.0.pc.in} | 6 +-
doc/Makefile.am | 2 +-
gladeui/Makefile.am | 21 +-
gladeui/glade-app.c | 103 +-
gladeui/glade-app.h | 5 +-
gladeui/glade-base-editor.c | 56 +-
gladeui/glade-cell-renderer-icon.c | 9 +-
gladeui/glade-command.c | 25 +-
gladeui/glade-cursor.c | 3 +-
gladeui/glade-design-layout.c | 641 ++---
gladeui/glade-design-layout.h | 5 +-
gladeui/glade-design-view.c | 78 +-
gladeui/glade-editor-property.c | 84 +-
gladeui/glade-editor-table.c | 74 +-
gladeui/glade-editor-table.h | 3 -
gladeui/glade-editor.c | 9 +-
gladeui/glade-inspector.c | 42 +-
gladeui/glade-marshallers.list | 1 +
gladeui/glade-named-icon-chooser-dialog.c | 11 +-
gladeui/glade-palette.c | 22 +-
gladeui/glade-placeholder.c | 212 +-
gladeui/glade-placeholder.h | 4 +-
gladeui/glade-popup.c | 7 +-
gladeui/glade-previewer.c | 11 +-
gladeui/glade-project.c | 523 +++--
gladeui/glade-project.h | 10 +-
gladeui/glade-property-class.c | 8 +-
gladeui/glade-property-class.h | 2 +
gladeui/glade-property.c | 7 +-
gladeui/glade-utils.c | 332 +--
gladeui/glade-utils.h | 6 +-
gladeui/glade-widget-adaptor.c | 280 ++-
gladeui/glade-widget-adaptor.h | 2 +
gladeui/glade-widget.c | 493 ++--
gladeui/glade-widget.h | 11 +-
plugins/gtk+/Makefile.am | 13 +-
plugins/gtk+/glade-accels.c | 2 -
plugins/gtk+/glade-attributes.c | 2 -
plugins/gtk+/glade-column-types.c | 28 +-
plugins/gtk+/glade-column-types.h | 2 +
plugins/gtk+/glade-convert.c | 9 +-
plugins/gtk+/glade-gtk.c | 476 +++-
plugins/gtk+/glade-icon-sources.c | 5 +-
plugins/gtk+/glade-model-data.c | 12 +-
plugins/gtk+/glade-text-button.c | 4 +-
plugins/gtk+/gtk+.xml.in | 87 +-
po/ar.po | 2 +-
po/ast.po | 2 +-
po/bg.po | 2 +-
po/ca.po | 13 +-
po/ca valencia po | 2 +-
po/cs.po | 2 +-
po/da.po | 2 +-
po/de.po | 2 +-
po/el.po | 2 +-
po/en shaw po | 4 +-
po/en_GB.po | 2 +-
po/eo.po | 2 +-
po/es.po | 849 +++---
po/et.po | 848 +++---
po/eu.po | 2 +-
po/fi.po | 2 +-
po/fr.po | 2 +-
po/gl.po | 2 +-
po/he.po | 2997 ++++++++++----------
po/hu.po | 2 +-
po/hy.po | 2 +-
po/id.po | 2 +-
po/it.po | 2 +-
po/ja.po | 2 +-
po/ko.po | 2 +-
po/lt.po | 2 +-
po/lv.po | 2 +-
po/mai.po | 2 +-
po/ml.po | 2 +-
po/nb.po | 2 +-
po/or.po | 2 +-
po/pl.po | 2 +-
po/pt.po | 2 +-
po/pt_BR.po | 2 +-
po/ro.po | 2 +-
po/ru.po | 2 +-
po/sl.po | 2 +-
po/sr.po | 2 +-
po/sr latin po | 2 +-
po/sv.po | 2 +-
po/te.po | 2 +-
po/th.po | 2 +-
po/tr.po | 2 +-
po/ug.po | 1086 ++++----
po/uk.po | 2 +-
po/vi.po | 2 +-
po/zh_CN.po | 2 +-
po/zh_HK.po | 2713 ++++++++----------
po/zh_TW.po | 2750 ++++++++----------
src/Makefile.am | 8 +-
src/glade-window.c | 282 ++-
src/main.c | 5 +-
102 files changed, 7734 insertions(+), 7959 deletions(-)
---
diff --cc gladeui/glade-project.c
index 0a28714,90d4eee..9b85496
--- a/gladeui/glade-project.c
+++ b/gladeui/glade-project.c
@@@ -2935,28 -3157,16 +3155,14 @@@ glade_project_add_object (GladeProject
glade_project_reserve_widget_name (project, gwidget, gwidget->name);
glade_widget_set_project (gwidget, (gpointer)project);
- g_object_ref (object);
+ g_object_ref_sink (gwidget);
+ /* Be sure to update the lists before emitting signals */
if (glade_widget_get_parent (gwidget) == NULL)
- {
- project->priv->tree = g_list_insert_sorted (project->priv->tree, object,
- (GCompareFunc)sort_project_dependancies);
- }
-
- /* Be sure to update the list before emitting signals */
- project->priv->objects = g_list_prepend (project->priv->objects,
- object);
+ project->priv->tree = g_list_append (project->priv->tree, object);
- if (!project->priv->loading)
- {
- GtkTreeIter iter;
- glade_project_model_get_iter_for_object (project, object, &iter);
- path = gtk_tree_model_get_path (GTK_TREE_MODEL (project), &iter);
-
- gtk_tree_model_row_inserted (GTK_TREE_MODEL (project), path, &iter);
- project->priv->stamp++;
- }
+ project->priv->objects = g_list_prepend (project->priv->objects, object);
- glade_project_notify_row_inserted (project, gwidget);
-
/* NOTE: Sensitive ordering here, we need to recurse after updating
* the tree model listeners (and update those listeners after our
* internal lists have been resolved), otherwise children are added
@@@ -3670,7 -3867,7 +3863,6 @@@ glade_project_redo_items (GladeProject
return menu;
}
--
void
glade_project_reset_path (GladeProject *project)
{
diff --cc gladeui/glade-widget.c
index 223f9b4,1070e9e..f496a47
--- a/gladeui/glade-widget.c
+++ b/gladeui/glade-widget.c
@@@ -894,13 -890,11 +926,17 @@@ glade_widget_dispose (GObject *object
{
g_list_foreach (widget->packing_actions, (GFunc)g_object_unref, NULL);
g_list_free (widget->packing_actions);
+ widget->packing_actions = NULL;
}
-
++
+ if (widget->signal_model)
+ {
+ g_object_unref (widget->signal_model);
+ widget->signal_model = NULL;
+ }
+
+ glade_widget_pop_superuser ();
+
G_OBJECT_CLASS (glade_widget_parent_class)->dispose (object);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
