[glade3/signal-tree-model: 44/358] Merge branch 'master' into signal-tree-model

[Johannes Schmid <jhs src gnome org>]

commit ea640a6a71e34b4468fa45a617bc1ba020deb3b8
Merge: b996233 732c6bb
Author: Johannes Schmid <jhs gnome org>
Date:   Sun Jun 6 22:35:46 2010 +0200

    Merge branch 'master' into signal-tree-model
    
    Conflicts:
    	gladeui/Makefile.am

 ChangeLog                      |   51 +-
 NEWS                           |   35 +
 configure.ac                   |    8 +-
 gladeui/glade-app.c            |   14 +-
 gladeui/glade-base-editor.c    |   13 +-
 gladeui/glade-catalog.c        |    6 +-
 gladeui/glade-editor.c         |    6 +-
 gladeui/glade-inspector.c      |  780 +++-------
 gladeui/glade-palette.c        |    6 +-
 gladeui/glade-project.c        |  487 ++++++-
 gladeui/glade-project.h        |   20 +
 gladeui/glade-signal-editor.c  |  546 ++++----
 gladeui/glade-signal-editor.h  |   83 +-
 gladeui/glade-utils.c          |    8 +-
 gladeui/glade-widget-adaptor.c |    8 +-
 gladeui/glade-widget-adaptor.h |    2 +-
 gladeui/glade-widget.c         |   42 +-
 gladeui/glade-widget.h         |    2 +
 po/en shaw po                  | 3206 +++++++++++++++++++++++++++-------------
 po/et.po                       |    6 +-
 po/gl.po                       | 1811 ++++++++++++-----------
 po/nb.po                       | 2298 ++++++++++++++++-------------
 src/glade-window.c             |   10 -
 23 files changed, 5433 insertions(+), 4015 deletions(-)
---
diff --cc gladeui/glade-signal-editor.c
index d787e46,d75ce4b..ee883e9
--- a/gladeui/glade-signal-editor.c
+++ b/gladeui/glade-signal-editor.c
@@@ -1291,23 -1364,8 +1365,23 @@@ glade_signal_editor_load_widget (GladeS
  	}
  
  	path_first = gtk_tree_path_new_first ();
- 	gtk_tree_view_expand_row (GTK_TREE_VIEW (editor->signals_list), path_first, FALSE);
+ 	gtk_tree_view_expand_row (GTK_TREE_VIEW (priv->signals_list), path_first, FALSE);
  	gtk_tree_path_free (path_first);
 +
 +	/* DEBUG */
 +	{
 +		GtkWidget* window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 +		GtkWidget* tree = gtk_tree_view_new_with_model (glade_signal_model_new (widget));
 +		GtkCellRenderer* renderer = gtk_cell_renderer_text_new ();
 +		GtkTreeViewColumn* column = gtk_tree_view_column_new_with_attributes ("Name",
 +		                                                             renderer,
 +		                                                             "text", GLADE_SIGNAL_COLUMN_NAME,
 +		                                                             NULL);
 +		gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column);
 +
 +		gtk_container_add (GTK_CONTAINER (window), tree);
 +		gtk_widget_show_all (window);
 +	}
  }
  
  static void