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

[Johannes Schmid <jhs src gnome org>]

commit 618f2aa85028b80cf9c8c39686024d250c94b88a
Merge: 145fc77 3eb7bea
Author: Johannes Schmid <jhs gnome org>
Date:   Thu Jan 6 12:47:22 2011 +0100

    Merge branch 'master' into signal-tree-model
    
    Conflicts:
    	gladeui/glade-app.h
    	gladeui/glade-signal-editor.c
    	gladeui/glade-signal.h
    	gladeui/glade-widget.c

 ChangeLog                                 |   73 ++-
 NEWS                                      |   48 ++
 doc/gladeui.types                         |    2 +-
 gladeui/Makefile.am                       |    3 +-
 gladeui/glade-app.c                       |    2 +-
 gladeui/glade-app.h                       |    9 +-
 gladeui/glade-base-editor.h               |    7 +
 gladeui/glade-catalog.h                   |    4 +-
 gladeui/glade-command.c                   |    7 +-
 gladeui/glade-design-layout.h             |   16 +-
 gladeui/glade-design-view.h               |   10 +-
 gladeui/glade-editable.h                  |   23 +-
 gladeui/glade-editor-property.h           |    2 -
 gladeui/glade-editor.c                    |  169 +++--
 gladeui/glade-inspector.c                 |   24 +-
 gladeui/glade-named-icon-chooser-dialog.h |   15 +-
 gladeui/glade-palette.c                   |   45 --
 gladeui/glade-placeholder.c               |  107 ++-
 gladeui/glade-placeholder.h               |   29 +-
 gladeui/glade-popup.c                     |   46 +-
 gladeui/glade-project.c                   |   69 +--
 gladeui/glade-project.h                   |   11 +-
 gladeui/glade-signal.c                    |  333 +++++++---
 gladeui/glade-signal.h                    |   32 +-
 gladeui/glade-widget-action.c             |  228 ++++--
 gladeui/glade-widget-action.h             |   69 ++-
 gladeui/glade-widget-adaptor.c            |   52 +-
 gladeui/glade-widget.c                    |  133 ++--
 gladeui/glade-widget.h                    |   10 +-
 plugins/gtk+/glade-gtk.c                  |    5 +-
 po/POTFILES.in                            |    7 +-
 po/es.po                                  | 1147 ++++++++++++++---------------
 src/glade-window.c                        |  147 +++--
 33 files changed, 1665 insertions(+), 1219 deletions(-)
---
diff --cc gladeui/Makefile.am
index fe7c42a,71ec937..6bf5c6f
--- a/gladeui/Makefile.am
+++ b/gladeui/Makefile.am
@@@ -85,10 -86,8 +86,9 @@@ libgladeui_2_la_SOURCES = 
  	glade-popup.h \
  	glade-marshallers.h \
  	glade-accumulators.h \
- 	glade-widget-action.c \
  	glade-name-context.c \
  	glade-displayable-values.c \
 +	glade-signal-model.c
  	glade-cell-renderer-icon.c
  
  libgladeui_2_la_CPPFLAGS =  \
diff --cc gladeui/glade-app.h
index 31b5332,5becf2f..dc2e91c
--- a/gladeui/glade-app.h
+++ b/gladeui/glade-app.h
@@@ -52,9 -52,20 +52,16 @@@ struct _GladeAp
  
  struct _GladeAppClass
  {
- 	GObjectClass parent_class;
+   GObjectClass parent_class;
+ 
 -  /* signals */
 -  void   (* signal_editor_created) (GladeApp *app, GladeSignalEditor *signal_editor);
 -
+   void   (* glade_reserved1)   (void);
+   void   (* glade_reserved2)   (void);
+   void   (* glade_reserved3)   (void);
+   void   (* glade_reserved4)   (void);
+   void   (* glade_reserved5)   (void);
+   void   (* glade_reserved6)   (void);
  };
  
 -
  GType              glade_app_get_type             (void) G_GNUC_CONST;
  
  GladeApp*          glade_app_new                  (void);
diff --cc gladeui/glade-signal.c
index a7fdee1,abb35b6..9f50f1f
--- a/gladeui/glade-signal.c
+++ b/gladeui/glade-signal.c
@@@ -95,9 -257,10 +257,10 @@@ glade_signal_new (const gchar * name
   * Returns: %TRUE if @sig1 and @sig2 have identical attributes, %FALSE otherwise
   */
  gboolean
 -glade_signal_equal (GladeSignal * sig1, GladeSignal * sig2)
 +glade_signal_equal (const GladeSignal *sig1, const GladeSignal *sig2)
  {
    gboolean ret = FALSE;
+ 
    g_return_val_if_fail (GLADE_IS_SIGNAL (sig1), FALSE);
    g_return_val_if_fail (GLADE_IS_SIGNAL (sig2), FALSE);
  
@@@ -235,22 -398,8 +398,8 @@@ glade_signal_read (GladeXmlNode * node
    return signal;
  }
  
- void
- glade_signal_set_name (GladeSignal *signal,
- 		       const gchar *name)
- {
-   g_return_if_fail (GLADE_IS_SIGNAL (signal));
- 
-   if (g_strcmp0 (signal->name, name))
-     {
-       g_free (signal->name);
-       signal->name =
-           name ? g_strdup (name) : NULL;
-     }
- }
- 
  G_CONST_RETURN gchar *
 -glade_signal_get_name (GladeSignal *signal)
 +glade_signal_get_name (const GladeSignal *signal)
  {
    g_return_val_if_fail (GLADE_IS_SIGNAL (signal), NULL);
  
diff --cc gladeui/glade-signal.h
index bc753cd,c746c0f..04bae11
--- a/gladeui/glade-signal.h
+++ b/gladeui/glade-signal.h
@@@ -15,10 -39,9 +39,8 @@@ GladeSignal          *glade_signal_ne
  							const gchar        *userdata,
  							gboolean            after,
  							gboolean            swapped);
--GladeSignal          *glade_signal_clone               (const GladeSignal  *signal);
- void                  glade_signal_free                (GladeSignal        *signal);
 -gboolean              glade_signal_equal               (GladeSignal        *sig1, 
 -							GladeSignal        *sig2);
 +gboolean              glade_signal_equal               (const GladeSignal        *sig1, 
 +							const GladeSignal        *sig2);
  GladeSignal          *glade_signal_read                (GladeXmlNode       *node);
  void                  glade_signal_write               (GladeSignal        *signal,
  							GladeXmlContext    *context,
diff --cc gladeui/glade-widget.c
index e3be5f8,4fd181d..912a015
--- a/gladeui/glade-widget.c
+++ b/gladeui/glade-widget.c
@@@ -361,38 -344,22 +361,31 @@@ glade_widget_remove_signal_handler (Gla
    /* trying to remove an inexistent signal? */
    g_assert (signals);
  
- 	for (i = 0; i < signals->len; i++)
- 	{
- 		tmp_signal_handler = g_ptr_array_index (signals, i);
- 		if (glade_signal_equal (tmp_signal_handler, signal_handler))
- 		{
- 			g_signal_emit (widget, glade_widget_signals[REMOVE_SIGNAL_HANDLER], 0, tmp_signal_handler);
- 			g_ptr_array_remove_index (signals, i);
- 			if (signals->len == 0)
- 			{
- 				g_hash_table_remove (widget->priv->signals, glade_signal_get_name (tmp_signal_handler));
- 			}
- 			else
- 			{
- 				glade_signal_free (tmp_signal_handler);
- 			}
- 			break;
- 		}
- 	}
+   for (i = 0; i < signals->len; i++)
+     {
+       tmp_signal_handler = g_ptr_array_index (signals, i);
+       if (glade_signal_equal (tmp_signal_handler, signal_handler))
+         {
++		  g_signal_emit (widget, glade_widget_signals[REMOVE_SIGNAL_HANDLER], 0, tmp_signal_handler);
+           g_object_unref (tmp_signal_handler);
+           g_ptr_array_remove_index (signals, i);
+           break;
+         }
+     }
  }
  
 -static void
 -glade_widget_change_signal_handler_impl (GladeWidget * widget,
 -                                         GladeSignal * old_signal_handler,
 -                                         GladeSignal * new_signal_handler)
 +/**
 + * glade_widget_change_signal_handler:
 + * @widget: A #GladeWidget
 + * @old_signal_handler: the old #GladeSignal
 + * @new_signal_handler: the new #GladeSignal
 + *
 + * Changes a #GladeSignal on @widget 
 + */
 +void
 +glade_widget_change_signal_handler (GladeWidget * widget,
 +                                    const GladeSignal * old_signal_handler,
 +                                    const GladeSignal * new_signal_handler)
  {
    GPtrArray *signals;
    GladeSignal *signal_handler_iter;