Rolling 3.18.3

If the property is construct-only, then glade_widget_rebuild() will be called
which means the object will be removed from the project/selection and
a new one will be added, which makes the eprop loose its focus.

NEWS

@@ -1,3 +1,59 @@
+============
+Glade 3.18.3
+============
+
+	- Fixed property editor focus lost bug with construct-only properties 
+	- GladePreviewer: Fixed bug previewing templates.
+	- Fixed Bug 727914 "Logo is not shown in About-dialog"
+	- Fixed Bug 353002 "wrong cursor over widgets"
+	- Fixed bug 728377 "sensitivity of mnemonic-widget entry is not correct when loading file" (David Shea)
+	- Fixed bug 728348 "impossible to set non-integer values for scale in text attribute dialog" (David Shea)
+	- Fixed bug 726410 "Save palette appearance between sessions" (TingPing)
+
+============
+Glade 3.18.2
+============
+
+	- Added dialog at start up to advertise user survey.
+	  Fixes bug 726800 "New: UI break: add dialog to advertise user survey"
+	- Fixes bug 727992 "Editing UI and saving does not remove deleted Combo with Entry"
+	- Fixed bug 364064 "Property Editor / Common tab: width & height request checkboxes have no effect"
+
+============
+Glade 3.18.1
+============
+
+	- Fixed Bug 727014 "32 bit builds fail with -Werror=format-security"
+	- GtkDialog: disabled use-header-bar property untill Glade supports GtkHeaderBar
+	- Fixed bug in numeric property editors (Box size)
+
+============
+Glade 3.18.0
+============
+
+	- Added License property to Glade project
+	- Added realtime preview for custom CSS
+	- Added support for previewing templates
+	- glade-previewer added --slideshow option
+	- Fixed Bug 702314 "Cancelling an Add Parent action is destructive"
+	- pango attribute editor: don't write on cancel for color/font (Timm Bäder)
+	- Fixed bug 711568 "[PATCH] glade crashes upon startup" (thanks to Lubomir Rintel)
+	- Fixed Bug 712289 "Glade silently fails to open malformed ui file"
+	- Sort object dependancy before saving using a topological sorting algorithm
+	- Fixed Bug 709609 "[PATCH] Change way of sorting before writing XML output."
+	- Fixed Bug 711858 "editing glade project results in long CPU usage spikes after upgrading to 3.16 and GTK+3.10" 
+	- Fixed <requires> tag output
+	- Fixed cellrenderer model column combobox chooser.
+	- Fixed issue with numeric property editors.
+	- Restored shortcuts function in workspace.
+	- Added new jhbuild based bundling system for 64bit linux bundles. (Tristan Van Berkom)
+	- Bug 720585 - Fix order of customized property output.
+	- gladeui: fix a pair of printf security problems (Ryan Lortie)
+	- Added Registration & User Survey Dialog in Help menu
+	- Fixed bug 723819 "Correct bounds checking for design view highlight" (Chris Johns)
+	- Fixed bug #721098 "Anjuta hangs when opening project"
+	- GtkGrid: Don't save width/height at their default values (Kalev Lember)
+
 ============
 Glade 3.16.0
 ============

configure.ac

@@ -3,8 +3,8 @@ dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.52)
 
 m4_define(glade_major_version, 3)
-m4_define(glade_minor_version, 16)
-m4_define(glade_micro_version, 0)
+m4_define(glade_minor_version, 18)
+m4_define(glade_micro_version, 3)
 m4_define(glade_version, glade_major_version.glade_minor_version.glade_micro_version)
 
 AC_INIT([glade], [glade_version],
@@ -53,9 +53,9 @@ AC_PATH_PROG(DLLTOOL, dlltool)
 # 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/libtool.html#Versioning
 
-GLADE_REVISION=2
-GLADE_CURRENT=6
-GLADE_AGE=0
+GLADE_REVISION=3
+GLADE_CURRENT=7
+GLADE_AGE=1
 GLADE_CURRENT_MINUS_AGE=`expr $GLADE_CURRENT - $GLADE_AGE`
 AC_SUBST(GLADE_REVISION)
 AC_SUBST(GLADE_CURRENT)
@@ -145,7 +145,7 @@ GOBJECT_INTROSPECTION_CHECK([1.32.0])
 dnl ================================================================
 dnl Check for gtk+
 dnl ================================================================
-GTK_REQUIRED=3.10.0
+GTK_REQUIRED=3.12.0
 PKG_CHECK_MODULES([GTK],[
   gtk+-3.0 >= $GTK_REQUIRED
   gmodule-2.0

gladeui/glade-app.c

@@ -53,9 +53,6 @@
 
 #define GLADE_CONFIG_FILENAME "glade.conf"
 
-#define GLADE_APP_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), \
-                                       GLADE_TYPE_APP,                        \
-                                       GladeAppPrivate))
 enum
 {
   DOC_SEARCH,
@@ -91,15 +88,15 @@ static gchar *lib_dir = NULL;
 static GladeApp *singleton_app = NULL;
 static gboolean check_initialised = FALSE;
 
-G_DEFINE_TYPE (GladeApp, glade_app, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_PRIVATE (GladeApp, glade_app, G_TYPE_OBJECT);
 
 /*****************************************************************
  *                    GObjectClass                               *
  *****************************************************************/
 static GObject *
-glade_app_constructor (GType type,
-                       guint n_construct_properties,
-                       GObjectConstructParam * construct_properties)
+glade_app_constructor (GType                  type,
+                       guint                  n_construct_properties,
+                       GObjectConstructParam *construct_properties)
 {
   GObject *object;
 
@@ -122,7 +119,7 @@ glade_app_constructor (GType type,
 
 
 static void
-glade_app_dispose (GObject * app)
+glade_app_dispose (GObject *app)
 {
   GladeAppPrivate *priv = GLADE_APP (app)->priv;
 
@@ -143,7 +140,7 @@ glade_app_dispose (GObject * app)
 }
 
 static void
-glade_app_finalize (GObject * app)
+glade_app_finalize (GObject *app)
 {
   g_free (catalogs_dir);
   g_free (modules_dir);
@@ -271,10 +268,10 @@ glade_app_get_lib_dir (void)
 }
 
 static void
-pointer_mode_register_icon (GtkIconFactory *factory,
-                            const gchar *icon_name,
+pointer_mode_register_icon (GtkIconFactory  *factory,
+                            const gchar     *icon_name,
                             GladePointerMode mode,
-                            GtkIconSize size)
+                            GtkIconSize      size)
 {
   GdkPixbuf *pixbuf;
 
@@ -289,10 +286,10 @@ pointer_mode_register_icon (GtkIconFactory *factory,
 
 static void
 register_stock_icon (GtkIconFactory *factory,
-                     const gchar *stock_id,
-                     const gchar *icon_name,
-                     const gchar *file_name,
-                     GtkIconSize size)
+                     const gchar    *stock_id,
+                     const gchar    *icon_name,
+                     const gchar    *file_name,
+                     GtkIconSize     size)
 {
   GtkIconTheme *icon_theme = gtk_icon_theme_get_default ();
   GdkPixbuf *pixbuf;
@@ -370,7 +367,7 @@ static void
 glade_app_init (GladeApp *app)
 {
   static gboolean initialized = FALSE;
-  GladeAppPrivate *priv = app->priv = GLADE_APP_GET_PRIVATE (app);
+  GladeAppPrivate *priv = app->priv = glade_app_get_instance_private (app);
 
   singleton_app = app;
 
@@ -407,7 +404,7 @@ glade_app_event_handler (GdkEvent *event, gpointer data)
 }
 
 static void
-glade_app_class_init (GladeAppClass * klass)
+glade_app_class_init (GladeAppClass *klass)
 {
   GObjectClass *object_class;
 	
@@ -465,9 +462,7 @@ glade_app_class_init (GladeAppClass * klass)
                   G_SIGNAL_RUN_LAST,
                   0, NULL, NULL,
                   _glade_marshal_VOID__OBJECT,
-                  G_TYPE_NONE, 1, G_TYPE_OBJECT);  
-  
-  g_type_class_add_private (klass, sizeof (GladeAppPrivate));
+                  G_TYPE_NONE, 1, G_TYPE_OBJECT);
 
   gdk_event_handler_set (glade_app_event_handler, NULL, NULL);
 }
@@ -633,7 +628,7 @@ glade_app_get (void)
 }
 
 void
-glade_app_set_window (GtkWidget * window)
+glade_app_set_window (GtkWidget *window)
 {
   GladeApp *app = glade_app_get ();
 
@@ -641,7 +636,7 @@ glade_app_set_window (GtkWidget * window)
 }
 
 GladeCatalog *
-glade_app_get_catalog (const gchar * name)
+glade_app_get_catalog (const gchar *name)
 {
   GladeApp *app = glade_app_get ();
   GList *list;
@@ -659,7 +654,7 @@ glade_app_get_catalog (const gchar * name)
 }
 
 gboolean
-glade_app_get_catalog_version (const gchar * name, gint * major, gint * minor)
+glade_app_get_catalog_version (const gchar *name, gint *major, gint *minor)
 {
   GladeCatalog *catalog = glade_app_get_catalog (name);
 
@@ -725,7 +720,7 @@ glade_app_get_config (void)
 }
 
 gboolean
-glade_app_is_project_loaded (const gchar * project_path)
+glade_app_is_project_loaded (const gchar *project_path)
 {
   GladeApp *app;
   GList *list;
@@ -757,7 +752,7 @@ glade_app_is_project_loaded (const gchar * project_path)
  * Returns: A #GladeProject, or NULL if no such open project was found
  */
 GladeProject *
-glade_app_get_project_by_path (const gchar * project_path)
+glade_app_get_project_by_path (const gchar *project_path)
 {
   GladeApp *app;
   GList *l;
@@ -788,7 +783,7 @@ glade_app_get_project_by_path (const gchar * project_path)
 }
 
 void
-glade_app_add_project (GladeProject * project)
+glade_app_add_project (GladeProject *project)
 {
   GladeApp *app;
 
@@ -805,7 +800,7 @@ glade_app_add_project (GladeProject * project)
 }
 
 void
-glade_app_remove_project (GladeProject * project)
+glade_app_remove_project (GladeProject *project)
 {
   GladeApp *app;
   g_return_if_fail (GLADE_IS_PROJECT (project));

gladeui/glade-base-editor.c

@@ -114,15 +114,15 @@ enum
   N_PROPERTIES
 };
 
-G_DEFINE_TYPE (GladeBaseEditor, glade_base_editor, GTK_TYPE_BOX)
+G_DEFINE_TYPE_WITH_PRIVATE (GladeBaseEditor, glade_base_editor, GTK_TYPE_BOX)
 
 static GParamSpec *properties[N_PROPERTIES];
 static guint glade_base_editor_signals[LAST_SIGNAL] = { 0 };
 
 static void glade_base_editor_set_container (GladeBaseEditor *editor,
-                                             GObject *container);
+                                             GObject         *container);
 static void glade_base_editor_block_callbacks (GladeBaseEditor *editor,
-                                               gboolean block);
+                                               gboolean         block);
 
 
 static void
@@ -199,8 +199,9 @@ get_children_model_for_child_type (GladeBaseEditor *editor, GType type)
 
 static gboolean
 glade_base_editor_get_type_info (GladeBaseEditor *e,
-                                 GtkTreeIter *retiter,
-                                 GType child_type, ...)
+                                 GtkTreeIter     *retiter,
+                                 GType            child_type,
+                                 ...)
 {
   GtkTreeModel *model;
   GtkTreeIter iter;
@@ -234,7 +235,7 @@ glade_base_editor_get_type_info (GladeBaseEditor *e,
 
 static gchar *
 glade_base_editor_get_display_name (GladeBaseEditor *editor,
-                                    GladeWidget *gchild)
+                                    GladeWidget     *gchild)
 {
   gchar *retval;
   g_signal_emit (editor,
@@ -245,8 +246,8 @@ glade_base_editor_get_display_name (GladeBaseEditor *editor,
 
 static void
 glade_base_editor_fill_store_real (GladeBaseEditor *e,
-                                   GladeWidget *gwidget,
-                                   GtkTreeIter *parent)
+                                   GladeWidget     *gwidget,
+                                   GtkTreeIter     *parent)
 {
   GList *children, *l;
   GtkTreeIter iter;
@@ -322,8 +323,8 @@ glade_base_editor_project_widget_name_changed (GladeProject *project,
 
 static GladeWidget *
 glade_base_editor_delegate_build_child (GladeBaseEditor *editor,
-                                        GladeWidget *parent,
-                                        GType type)
+                                        GladeWidget     *parent,
+                                        GType            type)
 {
   GladeWidget *child = NULL;
   g_signal_emit (editor, glade_base_editor_signals[SIGNAL_BUILD_CHILD],
@@ -333,8 +334,8 @@ glade_base_editor_delegate_build_child (GladeBaseEditor *editor,
 
 static gboolean
 glade_base_editor_delegate_delete_child (GladeBaseEditor *editor,
-                                         GladeWidget *parent,
-                                         GladeWidget *child)
+                                         GladeWidget     *parent,
+                                         GladeWidget     *child)
 {
   gboolean retval;
 
@@ -397,7 +398,7 @@ glade_base_editor_clear (GladeBaseEditor *editor)
 }
 
 static void
-glade_base_editor_treeview_cursor_changed (GtkTreeView *treeview,
+glade_base_editor_treeview_cursor_changed (GtkTreeView     *treeview,
                                            GladeBaseEditor *editor)
 {
   GladeBaseEditorPrivate *e = editor->priv;
@@ -468,8 +469,8 @@ glade_base_editor_set_cursor (GladeBaseEditor *e, GtkTreeIter *iter)
 
 static gboolean
 glade_base_editor_find_child_real (GladeBaseEditor *e,
-                                   GladeWidget *gchild,
-                                   GtkTreeIter *iter)
+                                   GladeWidget     *gchild,
+                                   GtkTreeIter     *iter)
 {
   GtkTreeModel *model = e->priv->model;
   GtkTreeIter child_iter;
@@ -497,8 +498,8 @@ glade_base_editor_find_child_real (GladeBaseEditor *e,
 
 static gboolean
 glade_base_editor_find_child (GladeBaseEditor *e,
-                              GladeWidget *child,
-                              GtkTreeIter *iter)
+                              GladeWidget     *child,
+                              GtkTreeIter     *iter)
 {
   if (gtk_tree_model_get_iter_first (e->priv->model, iter))
     return glade_base_editor_find_child_real (e, child, iter);
@@ -517,8 +518,8 @@ glade_base_editor_select_child (GladeBaseEditor *e, GladeWidget *child)
 
 static void
 glade_base_editor_child_change_type (GladeBaseEditor *editor,
-                                     GtkTreeIter *iter,
-                                     GType type)
+                                     GtkTreeIter     *iter,
+                                     GType            type)
 {
   GladeWidget *gchild;
   GObject *child;
@@ -591,9 +592,9 @@ glade_base_editor_type_changed (GtkComboBox *widget, GladeBaseEditor *e)
 
 static void
 glade_base_editor_child_type_edited (GtkCellRendererText *cell,
-                                     const gchar *path_string,
-                                     const gchar *new_text,
-                                     GladeBaseEditor *editor)
+                                     const gchar         *path_string,
+                                     const gchar         *new_text,
+                                     GladeBaseEditor     *editor)
 {
   GladeBaseEditorPrivate *e = editor->priv;
   GtkTreeModel *child_class;
@@ -648,7 +649,7 @@ glade_base_editor_child_type_edited (GtkCellRendererText *cell,
 
 static void
 glade_base_editor_reorder_children (GladeBaseEditor *editor,
-                                    GtkTreeIter *child)
+                                    GtkTreeIter     *child)
 {
   GtkTreeModel *model = editor->priv->model;
   GladeWidget *gchild;
@@ -764,7 +765,7 @@ glade_base_editor_add_child (GladeBaseEditor       *editor,
 
 
 static void
-glade_base_editor_add_item_activate (GtkMenuItem *menuitem,
+glade_base_editor_add_item_activate (GtkMenuItem     *menuitem,
                                      GladeBaseEditor *e)
 {
   GObject *item = G_OBJECT (menuitem);
@@ -861,8 +862,8 @@ glade_base_editor_popup (GladeBaseEditor *editor, GladeWidget *widget)
 }
 
 static gint
-glade_base_editor_popup_handler (GtkWidget *treeview,
-                                 GdkEventButton *event,
+glade_base_editor_popup_handler (GtkWidget       *treeview,
+                                 GdkEventButton  *event,
                                  GladeBaseEditor *e)
 {
   GtkTreePath *path;
@@ -936,8 +937,8 @@ glade_base_editor_delete_child (GladeBaseEditor *e)
 
 
 static gboolean
-glade_base_editor_treeview_key_press_event (GtkWidget *widget,
-                                            GdkEventKey *event,
+glade_base_editor_treeview_key_press_event (GtkWidget       *widget,
+                                            GdkEventKey     *event,
                                             GladeBaseEditor *e)
 {
   if (event->keyval == GDK_KEY_Delete)
@@ -1018,8 +1019,8 @@ glade_base_editor_update_treeview_idle (gpointer data)
 }
 
 static void
-glade_base_editor_project_widget_name_changed (GladeProject *project,
-                                               GladeWidget *widget,
+glade_base_editor_project_widget_name_changed (GladeProject    *project,
+                                               GladeWidget     *widget,
                                                GladeBaseEditor *editor)
 {
   GladeWidget *selected_child;
@@ -1094,9 +1095,9 @@ glade_base_editor_drag_and_drop_idle (gpointer data)
 }
 
 static void
-glade_base_editor_row_inserted (GtkTreeModel *model,
-                                GtkTreePath *path,
-                                GtkTreeIter *iter,
+glade_base_editor_row_inserted (GtkTreeModel    *model,
+                                GtkTreePath     *path,
+                                GtkTreeIter     *iter,
                                 GladeBaseEditor *e)
 {
   e->priv->iter = *iter;
@@ -1131,8 +1132,8 @@ glade_base_editor_project_remove_widget (GladeProject *project,
 }
 
 static void
-glade_base_editor_project_add_widget (GladeProject *project,
-                                      GladeWidget *widget,
+glade_base_editor_project_add_widget (GladeProject    *project,
+                                      GladeWidget     *widget,
                                       GladeBaseEditor *e)
 {
   if (e->priv->updating_treeview)
@@ -1151,9 +1152,9 @@ glade_base_editor_project_add_widget (GladeProject *project,
 
 static gboolean
 glade_base_editor_update_display_name (GtkTreeModel *model,
-                                       GtkTreePath *path,
-                                       GtkTreeIter *iter,
-                                       gpointer data)
+                                       GtkTreePath  *path,
+                                       GtkTreeIter  *iter,
+                                       gpointer      data)
 {
   GladeBaseEditor *editor = data;
   GladeWidget *gchild;
@@ -1172,9 +1173,9 @@ glade_base_editor_update_display_name (GtkTreeModel *model,
 }
 
 static void
-glade_base_editor_project_changed (GladeProject *project,
-                                   GladeCommand *command,
-                                   gboolean forward,
+glade_base_editor_project_changed (GladeProject    *project,
+                                   GladeCommand    *command,
+                                   gboolean         forward,
                                    GladeBaseEditor *editor)
 {
   gtk_tree_model_foreach (editor->priv->model,
@@ -1184,7 +1185,7 @@ glade_base_editor_project_changed (GladeProject *project,
 
 
 static void
-glade_base_editor_project_disconnect (GladeBaseEditor * editor)
+glade_base_editor_project_disconnect (GladeBaseEditor *editor)
 {
   GladeBaseEditorPrivate *e = editor->priv;
 
@@ -1274,16 +1275,6 @@ glade_base_editor_set_container (GladeBaseEditor *editor, GObject *container)
 }
 
 /*************************** GladeBaseEditor Class ****************************/
-static void
-glade_base_editor_finalize (GObject *object)
-{
-  GladeBaseEditor *cobj = GLADE_BASE_EDITOR (object);
-
-  g_free (cobj->priv);
-
-  G_OBJECT_CLASS (glade_base_editor_parent_class)->finalize (object);
-}
-
 static void
 glade_base_editor_dispose (GObject *object)
 {
@@ -1298,10 +1289,10 @@ glade_base_editor_dispose (GObject *object)
 }
 
 static void
-glade_base_editor_set_property (GObject *object,
-                                guint prop_id,
+glade_base_editor_set_property (GObject      *object,
+                                guint         prop_id,
                                 const GValue *value,
-                                GParamSpec *pspec)
+                                GParamSpec   *pspec)
 {
   GladeBaseEditor *editor = GLADE_BASE_EDITOR (object);
 
@@ -1317,9 +1308,9 @@ glade_base_editor_set_property (GObject *object,
 }
 
 static void
-glade_base_editor_get_property (GObject *object,
-                                guint prop_id,
-                                GValue *value,
+glade_base_editor_get_property (GObject    *object,
+                                guint       prop_id,
+                                GValue     *value,
                                 GParamSpec *pspec)
 {
   GladeBaseEditor *editor = GLADE_BASE_EDITOR (object);
@@ -1339,8 +1330,8 @@ glade_base_editor_get_property (GObject *object,
 /* Default handlers */
 static gboolean
 glade_base_editor_change_type (GladeBaseEditor *editor,
-                               GladeWidget *gchild,
-                               GType type)
+                               GladeWidget     *gchild,
+                               GType            type)
 {
   GladeWidget *parent, *gchild_new;
   GList *children, *l;
@@ -1429,7 +1420,7 @@ glade_base_editor_change_type (GladeBaseEditor *editor,
 
 static gchar *
 glade_base_editor_get_display_name_impl (GladeBaseEditor *editor,
-                                         GladeWidget *gchild)
+                                         GladeWidget     *gchild)
 {
   return g_strdup (glade_widget_get_name (gchild));
 }
@@ -1446,8 +1437,8 @@ glade_base_editor_build_child (GladeBaseEditor *editor,
 
 static gboolean
 glade_base_editor_move_child (GladeBaseEditor *editor,
-                              GladeWidget *gparent,
-                              GladeWidget *gchild)
+                              GladeWidget     *gparent,
+                              GladeWidget     *gchild)
 {
   GList list = { 0, };
 
@@ -1462,8 +1453,8 @@ glade_base_editor_move_child (GladeBaseEditor *editor,
 
 static gboolean
 glade_base_editor_delete_child_impl (GladeBaseEditor *editor,
-                                     GladeWidget *gparent,
-                                     GladeWidget *gchild)
+                                     GladeWidget     *gparent,
+                                     GladeWidget     *gchild)
 {
   GList list = { 0, };
 
@@ -1480,7 +1471,6 @@ glade_base_editor_class_init (GladeBaseEditorClass *klass)
 
   glade_base_editor_parent_class = g_type_class_peek_parent (klass);
 
-  object_class->finalize = glade_base_editor_finalize;
   object_class->dispose = glade_base_editor_dispose;
   object_class->set_property = glade_base_editor_set_property;
   object_class->get_property = glade_base_editor_get_property;
@@ -1665,9 +1655,9 @@ glade_base_editor_realize_callback (GtkWidget *widget, gpointer user_data)
 
 
 static void
-glade_base_editor_switch_page (GtkNotebook *notebook,
-                               GtkWidget *page,
-                               guint page_num,
+glade_base_editor_switch_page (GtkNotebook     *notebook,
+                               GtkWidget       *page,
+                               guint            page_num,
                                GladeBaseEditor *editor)
 {
   GladeBaseEditorPrivate *e = editor->priv;
@@ -1707,7 +1697,7 @@ glade_base_editor_init (GladeBaseEditor *editor)
 				  GTK_ORIENTATION_VERTICAL);
   gtk_box_set_spacing (GTK_BOX (editor), 8);
 
-  e = editor->priv = g_new0 (GladeBaseEditorPrivate, 1);
+  e = editor->priv = glade_base_editor_get_instance_private (editor);
 
   /* Paned */
   e->paned = paned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
@@ -2009,7 +1999,7 @@ glade_base_editor_append_types (GladeBaseEditor *editor, GType parent_type, ...)
  */
 void
 glade_base_editor_add_default_properties (GladeBaseEditor *editor,
-                                          GladeWidget *gchild)
+                                          GladeWidget     *gchild)
 {
   GtkTreeIter combo_iter;
   GtkWidget *label, *entry;
@@ -2076,8 +2066,9 @@ glade_base_editor_add_default_properties (GladeBaseEditor *editor,
  */
 void
 glade_base_editor_add_properties (GladeBaseEditor *editor,
-                                  GladeWidget *gchild,
-                                  gboolean packing, ...)
+                                  GladeWidget     *gchild,
+                                  gboolean         packing,
+                                  ...)
 {
   GladeEditorProperty *eprop;
   va_list args;
@@ -2114,8 +2105,8 @@ glade_base_editor_add_properties (GladeBaseEditor *editor,
  * NOTE: This function is intended to be used in "child-selected" callbacks
  */
 void
-glade_base_editor_add_editable (GladeBaseEditor *editor,
-                                GladeWidget *gchild,
+glade_base_editor_add_editable (GladeBaseEditor    *editor,
+                                GladeWidget        *gchild,
                                 GladeEditorPageType page)
 {
   GladeEditable *editable;
@@ -2183,8 +2174,7 @@ glade_base_editor_add_label (GladeBaseEditor *editor, gchar *str)
  * Shows/hide @editor 's signal editor
  */
 void
-glade_base_editor_set_show_signal_editor (GladeBaseEditor *editor,
-                                          gboolean val)
+glade_base_editor_set_show_signal_editor (GladeBaseEditor *editor, gboolean val)
 {
   g_return_if_fail (GLADE_IS_BASE_EDITOR (editor));
 
@@ -2223,8 +2213,8 @@ glade_base_editor_help (GtkButton *button, gchar *markup)
  */
 GtkWidget *
 glade_base_editor_pack_new_window (GladeBaseEditor *editor,
-                                   gchar *title,
-                                   gchar *help_markup)
+                                   gchar           *title,
+                                   gchar           *help_markup)
 {
   GtkWidget *window, *buttonbox, *button;
   gchar *real_title;

gladeui/glade-catalog.c

@@ -87,8 +87,8 @@ static GList *catalog_paths = NULL;
 
 static gboolean
 catalog_get_function (GladeCatalog *catalog,
-                      const gchar *symbol_name,
-                      gpointer *symbol_ptr)
+                      const gchar  *symbol_name,
+                      gpointer     *symbol_ptr)
 {
   if (catalog->module == NULL)
     catalog->module = glade_util_load_library (catalog->library);

gladeui/glade-cell-renderer-icon.c

@@ -23,22 +23,20 @@
 #include "glade-cell-renderer-icon.h"
 #include "glade-marshallers.h"
 
-static void glade_cell_renderer_icon_get_property (GObject * object,
-                                                   guint param_id,
-                                                   GValue * value,
-                                                   GParamSpec * pspec);
-static void glade_cell_renderer_icon_set_property (GObject * object,
-                                                   guint param_id,
-                                                   const GValue * value,
-                                                   GParamSpec * pspec);
-static gboolean glade_cell_renderer_icon_activate (GtkCellRenderer * cell,
-                                                   GdkEvent * event,
-                                                   GtkWidget * widget,
-                                                   const gchar * path,
-                                                   const GdkRectangle *
-                                                   background_area,
-                                                   const GdkRectangle *
-                                                   cell_area,
+static void glade_cell_renderer_icon_get_property (GObject      *object,
+                                                   guint         param_id,
+                                                   GValue       *value,
+                                                   GParamSpec   *pspec);
+static void glade_cell_renderer_icon_set_property (GObject      *object,
+                                                   guint         param_id,
+                                                   const GValue *value,
+                                                   GParamSpec   *pspec);
+static gboolean glade_cell_renderer_icon_activate (GtkCellRenderer     *cell,
+                                                   GdkEvent            *event,
+                                                   GtkWidget           *widget,
+                                                   const gchar         *path,
+                                                   const GdkRectangle  *background_area,
+                                                   const GdkRectangle  *cell_area,
                                                    GtkCellRendererState flags);
 
 struct _GladeCellRendererIconPrivate 
@@ -65,15 +63,13 @@ static GParamSpec *properties[N_PROPERTIES];
 static guint icon_cell_signals[LAST_SIGNAL] = { 0 };
 
 
-G_DEFINE_TYPE (GladeCellRendererIcon, glade_cell_renderer_icon,
-               GTK_TYPE_CELL_RENDERER_PIXBUF)
+G_DEFINE_TYPE_WITH_PRIVATE (GladeCellRendererIcon,
+                            glade_cell_renderer_icon,
+                            GTK_TYPE_CELL_RENDERER_PIXBUF)
 
 static void glade_cell_renderer_icon_init (GladeCellRendererIcon *cellicon)
 {
-  cellicon->priv =
-    G_TYPE_INSTANCE_GET_PRIVATE ((cellicon), 
-				 GLADE_TYPE_CELL_RENDERER_ICON, 
-				 GladeCellRendererIconPrivate);
+  cellicon->priv = glade_cell_renderer_icon_get_instance_private (cellicon);
 
   cellicon->priv->activatable = TRUE;
   cellicon->priv->active = FALSE;
@@ -83,7 +79,7 @@ static void glade_cell_renderer_icon_init (GladeCellRendererIcon *cellicon)
 }
 
 static void
-glade_cell_renderer_icon_class_init (GladeCellRendererIconClass * class)
+glade_cell_renderer_icon_class_init (GladeCellRendererIconClass *class)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (class);
   GtkCellRendererClass *cell_class = GTK_CELL_RENDERER_CLASS (class);
@@ -116,14 +112,13 @@ glade_cell_renderer_icon_class_init (GladeCellRendererIconClass * class)
                     G_STRUCT_OFFSET (GladeCellRendererIconClass, activate),
                     NULL, NULL,
                     _glade_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
-
-  g_type_class_add_private (class, sizeof (GladeCellRendererIconPrivate));
 }
 
 static void
-glade_cell_renderer_icon_get_property (GObject * object,
-                                       guint param_id,
-                                       GValue * value, GParamSpec * pspec)
+glade_cell_renderer_icon_get_property (GObject    *object,
+                                       guint       param_id,
+                                       GValue     *value,
+                                       GParamSpec *pspec)
 {
   GladeCellRendererIcon *cellicon = GLADE_CELL_RENDERER_ICON (object);
 
@@ -143,9 +138,10 @@ glade_cell_renderer_icon_get_property (GObject * object,
 
 
 static void
-glade_cell_renderer_icon_set_property (GObject * object,
-                                       guint param_id,
-                                       const GValue * value, GParamSpec * pspec)
+glade_cell_renderer_icon_set_property (GObject      *object,
+                                       guint         param_id,
+                                       const GValue *value,
+                                       GParamSpec   *pspec)
 {
   GladeCellRendererIcon *cellicon = GLADE_CELL_RENDERER_ICON (object);
 
@@ -170,12 +166,12 @@ glade_cell_renderer_icon_new (void)
 }
 
 static gint
-glade_cell_renderer_icon_activate (GtkCellRenderer * cell,
-                                   GdkEvent * event,
-                                   GtkWidget * widget,
-                                   const gchar * path,
-                                   const GdkRectangle * background_area,
-                                   const GdkRectangle * cell_area,
+glade_cell_renderer_icon_activate (GtkCellRenderer     *cell,
+                                   GdkEvent            *event,
+                                   GtkWidget           *widget,
+                                   const gchar         *path,
+                                   const GdkRectangle  *background_area,
+                                   const GdkRectangle  *cell_area,
                                    GtkCellRendererState flags)
 {
   GladeCellRendererIcon *cellicon;
@@ -191,7 +187,7 @@ glade_cell_renderer_icon_activate (GtkCellRenderer * cell,
 }
 
 gboolean
-glade_cell_renderer_icon_get_active (GladeCellRendererIcon * icon)
+glade_cell_renderer_icon_get_active (GladeCellRendererIcon *icon)
 {
   g_return_val_if_fail (GLADE_IS_CELL_RENDERER_ICON (icon), FALSE);
 
@@ -199,8 +195,8 @@ glade_cell_renderer_icon_get_active (GladeCellRendererIcon * icon)
 }
 
 void
-glade_cell_renderer_icon_set_active (GladeCellRendererIcon * icon,
-                                     gboolean setting)
+glade_cell_renderer_icon_set_active (GladeCellRendererIcon *icon,
+                                     gboolean               setting)
 {
   g_return_if_fail (GLADE_IS_CELL_RENDERER_ICON (icon));
 
@@ -212,7 +208,7 @@ glade_cell_renderer_icon_set_active (GladeCellRendererIcon * icon,
 }
 
 gboolean
-glade_cell_renderer_icon_get_activatable (GladeCellRendererIcon * icon)
+glade_cell_renderer_icon_get_activatable (GladeCellRendererIcon *icon)
 {
   g_return_val_if_fail (GLADE_IS_CELL_RENDERER_ICON (icon), FALSE);
 
@@ -220,8 +216,8 @@ glade_cell_renderer_icon_get_activatable (GladeCellRendererIcon * icon)
 }
 
 void
-glade_cell_renderer_icon_set_activatable (GladeCellRendererIcon * icon,
-                                          gboolean setting)
+glade_cell_renderer_icon_set_activatable (GladeCellRendererIcon *icon,
+                                          gboolean               setting)
 {
   g_return_if_fail (GLADE_IS_CELL_RENDERER_ICON (icon));
 

gladeui/glade-clipboard.c

@@ -55,11 +55,13 @@ enum
 
 static GParamSpec *properties[N_PROPERTIES];
 
-G_DEFINE_TYPE (GladeClipboard, glade_clipboard, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_PRIVATE (GladeClipboard, glade_clipboard, G_TYPE_OBJECT);
 
 static void
-glade_project_get_property (GObject * object,
-                            guint prop_id, GValue * value, GParamSpec * pspec)
+glade_project_get_property (GObject    *object,
+                            guint       prop_id,
+                            GValue     *value,
+                            GParamSpec *pspec)
 {
   GladeClipboard *clipboard = GLADE_CLIPBOARD (object);
 
@@ -92,25 +94,20 @@ glade_clipboard_class_init (GladeClipboardClass * klass)
   
   /* Install all properties */
   g_object_class_install_properties (object_class, N_PROPERTIES, properties);
-
-  g_type_class_add_private  (klass, sizeof (GladeClipboardPrivate));
 }
 
 static void
-glade_clipboard_init (GladeClipboard * clipboard)
+glade_clipboard_init (GladeClipboard *clipboard)
 {
-  clipboard->priv =
-    G_TYPE_INSTANCE_GET_PRIVATE (clipboard,
-				 GLADE_TYPE_CLIPBOARD,
-				 GladeClipboardPrivate);
+  clipboard->priv = glade_clipboard_get_instance_private (clipboard);
 
   clipboard->priv->widgets = NULL;
   clipboard->priv->has_selection = FALSE;
 }
 
 static void
-glade_clipboard_set_has_selection (GladeClipboard * clipboard,
-                                   gboolean has_selection)
+glade_clipboard_set_has_selection (GladeClipboard *clipboard,
+                                   gboolean        has_selection)
 {
   if (clipboard->priv->has_selection != has_selection)
     {
@@ -127,7 +124,7 @@ glade_clipboard_set_has_selection (GladeClipboard * clipboard,
  * Returns: TRUE if this clipboard has selected items to paste.
  */
 gboolean
-glade_clipboard_get_has_selection (GladeClipboard * clipboard)
+glade_clipboard_get_has_selection (GladeClipboard *clipboard)
 {
   g_return_val_if_fail (GLADE_IS_CLIPBOARD (clipboard), FALSE);
 
@@ -163,7 +160,7 @@ glade_clipboard_new (void)
  * This increases the reference count of each #GladeWidget in @widgets.
  */
 void
-glade_clipboard_add (GladeClipboard * clipboard, GList * widgets)
+glade_clipboard_add (GladeClipboard *clipboard, GList *widgets)
 {
   GladeWidget *widget;
   GList *list;
@@ -192,7 +189,7 @@ glade_clipboard_add (GladeClipboard * clipboard, GList * widgets)
  * Removes all widgets from the @clipboard.
  */
 void
-glade_clipboard_clear (GladeClipboard * clipboard)
+glade_clipboard_clear (GladeClipboard *clipboard)
 {
   GladeWidget *widget;
   GList *list;

gladeui/glade-command.c

@@ -94,7 +94,7 @@ static gint gc_group_id = 1;
 static gint gc_group_depth = 0;
 
 
-G_DEFINE_TYPE (GladeCommand, glade_command, G_TYPE_OBJECT)
+G_DEFINE_TYPE_WITH_PRIVATE (GladeCommand, glade_command, G_TYPE_OBJECT)
 
 static void
 glade_command_finalize (GObject *obj)
@@ -124,9 +124,7 @@ glade_command_collapse_impl (GladeCommand *this_cmd, GladeCommand *other_cmd)
 static void
 glade_command_init (GladeCommand *command)
 {
-  command->priv = 
-    G_TYPE_INSTANCE_GET_PRIVATE ((command), GLADE_TYPE_COMMAND,
-				 GladeCommandPrivate);
+  command->priv = glade_command_get_instance_private (command);
 }
 
 static void
@@ -142,8 +140,6 @@ glade_command_class_init (GladeCommandClass *klass)
   klass->execute = NULL;
   klass->unifies = glade_command_unifies_impl;
   klass->collapse = glade_command_collapse_impl;
-
-  g_type_class_add_private (klass, sizeof (GladeCommandPrivate));
 }
 
 /* Macros for defining the derived command types */

gladeui/glade-design-layout.c

@@ -35,9 +35,6 @@
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 
-#define GLADE_DESIGN_LAYOUT_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object),  \
-						 GLADE_TYPE_DESIGN_LAYOUT,               \
-						 GladeDesignLayoutPrivate))
 #define GLADE_DESIGN_LAYOUT_PRIVATE(object) (((GladeDesignLayout*)object)->priv)
 
 #define OUTLINE_WIDTH     4
@@ -124,7 +121,7 @@ enum
   PROP_DESIGN_VIEW
 };
 
-G_DEFINE_TYPE (GladeDesignLayout, glade_design_layout, GTK_TYPE_BIN)
+G_DEFINE_TYPE_WITH_PRIVATE (GladeDesignLayout, glade_design_layout, GTK_TYPE_BIN)
 
 #define RECTANGLE_POINT_IN(rect,x,y) (x >= rect.x && x <= (rect.x + rect.width) && y >= rect.y && y <= (rect.y + rect.height))
 
@@ -174,7 +171,7 @@ gdl_get_margins_from_pointer (GladeDesignLayout *layout, GtkWidget *widget, gint
 static Activity
 gdl_get_activity_from_pointer (GladeDesignLayout *layout, gint x, gint y)
 {
-  GladeDesignLayoutPrivate *priv = GLADE_DESIGN_LAYOUT_GET_PRIVATE (layout);
+  GladeDesignLayoutPrivate *priv = GLADE_DESIGN_LAYOUT_PRIVATE (layout);
   
   if (priv->selection)
     {
@@ -1787,7 +1784,7 @@ glade_design_layout_unrealize (GtkWidget * widget)
 static void
 glade_design_layout_style_updated (GtkWidget *widget)
 {
-  GladeDesignLayoutPrivate *priv = GLADE_DESIGN_LAYOUT_GET_PRIVATE (widget);
+  GladeDesignLayoutPrivate *priv = GLADE_DESIGN_LAYOUT_PRIVATE (widget);
   
   _glade_design_layout_get_colors (gtk_widget_get_style_context (widget),
                                    &priv->frame_color[0],
@@ -1805,7 +1802,7 @@ glade_design_layout_init (GladeDesignLayout *layout)
   GladeDesignLayoutPrivate *priv;
   gint i;
   
-  layout->priv = priv = GLADE_DESIGN_LAYOUT_GET_PRIVATE (layout);
+  layout->priv = priv = glade_design_layout_get_instance_private (layout);
 
   priv->activity = ACTIVITY_NONE;
 
@@ -2059,8 +2056,6 @@ glade_design_layout_class_init (GladeDesignLayoutClass * klass)
                                    GLADE_TYPE_DESIGN_LAYOUT,
                                    g_cclosure_new (G_CALLBACK (glade_design_layout_damage),
                                                    NULL, NULL));
-
-  g_type_class_add_private (object_class, sizeof (GladeDesignLayoutPrivate));
 }
 
 /* Internal API */

gladeui/glade-design-view.c

@@ -45,8 +45,6 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 
-#define GLADE_DESIGN_VIEW_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), GLADE_TYPE_DESIGN_VIEW, GladeDesignViewPrivate))
-
 #define GLADE_DESIGN_VIEW_KEY "GLADE_DESIGN_VIEW_KEY"
 
 enum
@@ -71,6 +69,7 @@ static GtkVBoxClass *parent_class = NULL;
 static void glade_design_view_drag_init (_GladeDragInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (GladeDesignView, glade_design_view, GTK_TYPE_BOX,
+                         G_ADD_PRIVATE (GladeDesignView)
                          G_IMPLEMENT_INTERFACE (GLADE_TYPE_DRAG,
                                                 glade_design_view_drag_init))
 
@@ -328,7 +327,7 @@ logo_draw (GtkWidget *widget, cairo_t *cr)
 static gboolean
 glade_design_view_draw (GtkWidget *widget, cairo_t *cr)
 {
-  GladeDesignViewPrivate *priv = GLADE_DESIGN_VIEW_GET_PRIVATE (widget);
+  GladeDesignViewPrivate *priv = GLADE_DESIGN_VIEW (widget)->priv;
   GdkWindow *window = gtk_widget_get_window (widget);
   gboolean should_draw = gtk_cairo_should_draw_window (cr, window);
   gboolean sw_visible = gtk_widget_get_visible (priv->scrolled_window);
@@ -370,7 +369,7 @@ glade_design_view_init (GladeDesignView *view)
 {
   GtkWidget *viewport;
 
-  view->priv = GLADE_DESIGN_VIEW_GET_PRIVATE (view);
+  view->priv = glade_design_view_get_instance_private (view);
 
   gtk_widget_set_no_show_all (GTK_WIDGET (view), TRUE);
   gtk_orientable_set_orientation (GTK_ORIENTABLE (view),
@@ -715,8 +714,6 @@ glade_design_view_class_init (GladeDesignViewClass *klass)
                                                         GLADE_TYPE_PROJECT,
                                                         G_PARAM_READWRITE |
                                                         G_PARAM_CONSTRUCT_ONLY));
-
-  g_type_class_add_private (object_class, sizeof (GladeDesignViewPrivate));
 }
 
 /* Private API */

gladeui/glade-editor-property.c

@@ -115,6 +115,7 @@ static void glade_editor_property_editable_init (GladeEditableIface *iface);
 static GladeEditableIface *parent_editable_iface;
 
 G_DEFINE_TYPE_WITH_CODE (GladeEditorProperty, glade_editor_property, GTK_TYPE_BOX,
+                         G_ADD_PRIVATE (GladeEditorProperty)
                          G_IMPLEMENT_INTERFACE (GLADE_TYPE_EDITABLE,
                                                 glade_editor_property_editable_init));
 
@@ -150,6 +151,26 @@ glade_editor_property_editable_init (GladeEditableIface *iface)
                                GladeEditorPropertyClass
  *******************************************************************************/
 
+static void
+deepest_child_grab_focus (GtkWidget *widget, gpointer data)
+{
+  gboolean *focus_set = data;
+
+  if (*focus_set)
+    return;
+  
+  if (GTK_IS_CONTAINER (widget))
+    gtk_container_foreach (GTK_CONTAINER (widget),
+                           deepest_child_grab_focus,
+                           data);
+
+  if (gtk_widget_get_can_focus (widget))
+    {
+      gtk_widget_grab_focus (widget);
+      *focus_set = TRUE;
+    }
+}
+
 /* declare this forwardly for the finalize routine */
 static void glade_editor_property_load_common (GladeEditorProperty *eprop,
                                                GladeProperty       *property);
@@ -168,6 +189,22 @@ glade_editor_property_commit_common (GladeEditorProperty *eprop,
    */
   if (!glade_property_equals_value (eprop->priv->property, value))
     glade_editor_property_load (eprop, eprop->priv->property);
+
+  /* Restore input focus. If the property is construct-only, then 
+   * glade_widget_rebuild() will be called which means the object will be
+   * removed from the project/selection and a new one will be added, which makes
+   * the eprop loose its focus.
+   * 
+   * FIXME: find a better way to set focus?
+   * make gtk_widget_grab_focus(eprop->priv->input) work?
+   */
+  if (glade_property_class_get_construct_only (eprop->priv->klass))
+    {
+      gboolean focus_set = FALSE;
+      gtk_container_foreach (GTK_CONTAINER (eprop->priv->input),
+                             deepest_child_grab_focus,
+                             &focus_set);
+    }
 }
 
 void
@@ -597,10 +634,7 @@ glade_editor_property_load_common (GladeEditorProperty *eprop,
 static void
 glade_editor_property_init (GladeEditorProperty *eprop)
 {
-  eprop->priv =
-    G_TYPE_INSTANCE_GET_PRIVATE ((eprop),
-				 GLADE_TYPE_EDITOR_PROPERTY,
-				 GladeEditorPropertyPrivate);
+  eprop->priv = glade_editor_property_get_instance_private (eprop);
 
   gtk_orientable_set_orientation (GTK_ORIENTABLE (eprop),
 				  GTK_ORIENTATION_HORIZONTAL);
@@ -692,8 +726,6 @@ glade_editor_property_class_init (GladeEditorPropertyClass *eprop_class)
        ("custom-text", _("Custom Text"),
         _("Custom Text to display in the property label"),
         NULL, G_PARAM_READWRITE));
-
-  g_type_class_add_private (eprop_class, sizeof (GladeEditorPropertyPrivate));
 }
 
 /*******************************************************************************
@@ -816,9 +848,17 @@ glade_eprop_numeric_force_update (GtkSpinButton       *spin,
   gdouble value;
   gchar *text;
 
-  val = glade_property_inline_value (prop);
   text = gtk_editable_get_chars (GTK_EDITABLE (spin), 0, -1);
 
+  /*
+   * Skip empty strings, otherwise if 0 is out of range the spin will get a
+   * bogus update.
+   */
+  if (text && *text == '\0')
+    return;
+  
+  val = glade_property_inline_value (prop);
+
   g_value_init (&newval, G_VALUE_TYPE (val));
   value = g_strtod (text, NULL);
   glade_eprop_numeric_value_set (&newval, value);
@@ -890,9 +930,6 @@ glade_eprop_numeric_create_input (GladeEditorProperty *eprop)
   /* The force update callback is here to ensure that whenever the value
    * is modified, it's committed immediately without requiring entry activation
    * (this avoids lost modifications when modifying a value and navigating away)
-   *
-   * FIXME: GtkSpinButton update its value on focus-out, why is not that enough?
-   * Could it be because this callback was used before using spins?
    */
   g_signal_connect (G_OBJECT (eprop_numeric->spin), "changed",
                     G_CALLBACK (glade_eprop_numeric_force_update), eprop);

gladeui/glade-editor-skeleton.c

@@ -49,6 +49,7 @@ static GladeEditableIface *parent_editable_iface;
 static GtkBuildableIface  *parent_buildable_iface;
 
 G_DEFINE_TYPE_WITH_CODE (GladeEditorSkeleton, glade_editor_skeleton, GTK_TYPE_BOX,
+                         G_ADD_PRIVATE (GladeEditorSkeleton)
 			 G_IMPLEMENT_INTERFACE (GLADE_TYPE_EDITABLE,
                                                 glade_editor_skeleton_editable_init)
 			 G_IMPLEMENT_INTERFACE (GTK_TYPE_BUILDABLE,
@@ -57,20 +58,15 @@ G_DEFINE_TYPE_WITH_CODE (GladeEditorSkeleton, glade_editor_skeleton, GTK_TYPE_BO
 static void
 glade_editor_skeleton_init (GladeEditorSkeleton *skeleton)
 {
-  skeleton->priv = 
-    G_TYPE_INSTANCE_GET_PRIVATE (skeleton,
-				 GLADE_TYPE_EDITOR_SKELETON,
-				 GladeEditorSkeletonPrivate);
+  skeleton->priv = glade_editor_skeleton_get_instance_private (skeleton);
 }
 
 static void
-glade_editor_skeleton_class_init (GladeEditorSkeletonClass *class)
+glade_editor_skeleton_class_init (GladeEditorSkeletonClass *klass)
 {
-  GObjectClass *gobject_class = G_OBJECT_CLASS (class);
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
   
   gobject_class->dispose = glade_editor_skeleton_dispose;
-
-  g_type_class_add_private (gobject_class, sizeof (GladeEditorSkeletonPrivate));
 }
 
 /***********************************************************
@@ -114,7 +110,7 @@ glade_editor_skeleton_load (GladeEditable   *editable,
 }
 
 static void
-glade_editor_skeleton_set_show_name (GladeEditable * editable, gboolean show_name)
+glade_editor_skeleton_set_show_name (GladeEditable *editable, gboolean show_name)
 {
   GladeEditorSkeleton *skeleton = GLADE_EDITOR_SKELETON (editable);
   GladeEditorSkeletonPrivate *priv = skeleton->priv;
@@ -129,7 +125,7 @@ glade_editor_skeleton_set_show_name (GladeEditable * editable, gboolean show_nam
 }
 
 static void
-glade_editor_skeleton_editable_init (GladeEditableIface * iface)
+glade_editor_skeleton_editable_init (GladeEditableIface *iface)
 {
   parent_editable_iface = g_type_default_interface_peek (GLADE_TYPE_EDITABLE);
 

gladeui/glade-editor-table.c

@@ -100,11 +100,12 @@ enum {
 };
 
 G_DEFINE_TYPE_WITH_CODE (GladeEditorTable, glade_editor_table, GTK_TYPE_GRID,
+                         G_ADD_PRIVATE (GladeEditorTable)
                          G_IMPLEMENT_INTERFACE (GLADE_TYPE_EDITABLE,
                                                 glade_editor_table_editable_init));
 
 static void
-glade_editor_table_class_init (GladeEditorTableClass * klass)
+glade_editor_table_class_init (GladeEditorTableClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
@@ -121,17 +122,12 @@ glade_editor_table_class_init (GladeEditorTableClass * klass)
 			  _("The editor page type to create this GladeEditorTable for"),
 			  GLADE_TYPE_EDITOR_PAGE_TYPE, GLADE_PAGE_GENERAL,
 			  G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
-
-  g_type_class_add_private (klass, sizeof (GladeEditorTablePrivate));
 }
 
 static void
-glade_editor_table_init (GladeEditorTable * self)
+glade_editor_table_init (GladeEditorTable *self)
 {
-  self->priv = 
-    G_TYPE_INSTANCE_GET_PRIVATE ((self),
-				 GLADE_TYPE_EDITOR_TABLE,
-				 GladeEditorTablePrivate);
+  self->priv = glade_editor_table_get_instance_private (self);
 
   gtk_orientable_set_orientation (GTK_ORIENTABLE (self),
                                   GTK_ORIENTATION_VERTICAL);
@@ -143,7 +139,7 @@ glade_editor_table_init (GladeEditorTable * self)
 }
 
 static void
-glade_editor_table_dispose (GObject * object)
+glade_editor_table_dispose (GObject *object)
 {
   GladeEditorTable *table = GLADE_EDITOR_TABLE (object);
 
@@ -179,7 +175,7 @@ glade_editor_table_set_property (GObject         *object,
 }
 
 static void
-glade_editor_table_realize (GtkWidget * widget)
+glade_editor_table_realize (GtkWidget *widget)
 {
   GladeEditorTable *table = GLADE_EDITOR_TABLE (widget);
   GList *list;
@@ -196,7 +192,7 @@ glade_editor_table_realize (GtkWidget * widget)
 }
 
 static void
-glade_editor_table_grab_focus (GtkWidget * widget)
+glade_editor_table_grab_focus (GtkWidget *widget)
 {
   GladeEditorTable *editor_table = GLADE_EDITOR_TABLE (widget);
 
@@ -210,7 +206,7 @@ glade_editor_table_grab_focus (GtkWidget * widget)
 }
 
 static void
-widget_name_edited (GtkWidget * editable, GladeEditorTable * table)
+widget_name_edited (GtkWidget *editable, GladeEditorTable *table)
 {
   GladeWidget *widget;
   gchar *new_name;
@@ -300,7 +296,7 @@ widget_composite_changed (GladeWidget      *widget,
 }
 
 static void
-widget_finalized (GladeEditorTable * table, GladeWidget * where_widget_was)
+widget_finalized (GladeEditorTable *table, GladeWidget *where_widget_was)
 {
   table->priv->loaded_widget = NULL;
 
@@ -309,7 +305,7 @@ widget_finalized (GladeEditorTable * table, GladeWidget * where_widget_was)
 
 
 static void
-glade_editor_table_load (GladeEditable * editable, GladeWidget * widget)
+glade_editor_table_load (GladeEditable *editable, GladeWidget *widget)
 {
   GladeEditorTable *table = GLADE_EDITOR_TABLE (editable);
   GladeEditorProperty *property;
@@ -392,7 +388,7 @@ glade_editor_table_load (GladeEditable * editable, GladeWidget * widget)
 }
 
 static void
-glade_editor_table_set_show_name (GladeEditable * editable, gboolean show_name)
+glade_editor_table_set_show_name (GladeEditable *editable, gboolean show_name)
 {
   GladeEditorTable *table = GLADE_EDITOR_TABLE (editable);
 
@@ -409,7 +405,7 @@ glade_editor_table_set_show_name (GladeEditable * editable, gboolean show_name)
 }
 
 static void
-glade_editor_table_editable_init (GladeEditableIface * iface)
+glade_editor_table_editable_init (GladeEditableIface *iface)
 {
   iface->load = glade_editor_table_load;
   iface->set_show_name = glade_editor_table_set_show_name;
@@ -466,7 +462,7 @@ property_class_comp (gconstpointer a, gconstpointer b)
 }
 
 static GList *
-get_sorted_properties (GladeWidgetAdaptor * adaptor, GladeEditorPageType type)
+get_sorted_properties (GladeWidgetAdaptor *adaptor, GladeEditorPageType type)
 {
   const GList *l, *properties;
   GList *list = NULL;
@@ -497,8 +493,9 @@ get_sorted_properties (GladeWidgetAdaptor * adaptor, GladeEditorPageType type)
 }
 
 static GladeEditorProperty *
-append_item (GladeEditorTable * table,
-             GladePropertyClass * klass, gboolean from_query_dialog)
+append_item (GladeEditorTable   *table,
+             GladePropertyClass *klass,
+             gboolean            from_query_dialog)
 {
   GladeEditorProperty *property;
   GtkWidget *label;
@@ -527,8 +524,9 @@ append_item (GladeEditorTable * table,
 }
 
 static void
-append_items (GladeEditorTable * table,
-              GladeWidgetAdaptor * adaptor, GladeEditorPageType type)
+append_items (GladeEditorTable   *table,
+              GladeWidgetAdaptor *adaptor,
+              GladeEditorPageType type)
 {
   GladeEditorProperty *property;
   GladePropertyClass *property_class;
@@ -548,7 +546,7 @@ append_items (GladeEditorTable * table,
 }
 
 static void
-append_name_field (GladeEditorTable * table)
+append_name_field (GladeEditorTable *table)
 {
   gchar *text = _("The object's unique identifier");
 
@@ -604,7 +602,7 @@ append_name_field (GladeEditorTable * table)
  *
  */
 GtkWidget *
-glade_editor_table_new (GladeWidgetAdaptor * adaptor, GladeEditorPageType type)
+glade_editor_table_new (GladeWidgetAdaptor *adaptor, GladeEditorPageType type)
 {
   GladeEditorTable *table;
 

gladeui/glade-editor.c

@@ -142,10 +142,10 @@ G_DEFINE_TYPE_WITH_PRIVATE (GladeEditor, glade_editor, GTK_TYPE_BOX);
 static GParamSpec *properties[N_PROPERTIES];
 
 static void
-glade_editor_set_property (GObject *object,
-                           guint prop_id,
+glade_editor_set_property (GObject      *object,
+                           guint         prop_id,
                            const GValue *value,
-                           GParamSpec *pspec)
+                           GParamSpec   *pspec)
 {
   GladeEditor *editor = GLADE_EDITOR (object);
 
@@ -170,9 +170,9 @@ glade_editor_set_property (GObject *object,
 }
 
 static void
-glade_editor_get_property (GObject *object,
-                           guint prop_id,
-                           GValue *value,
+glade_editor_get_property (GObject    *object,
+                           guint       prop_id,
+                           GValue     *value,
                            GParamSpec *pspec)
 {
   GladeEditor *editor = GLADE_EDITOR (object);
@@ -274,7 +274,7 @@ glade_editor_class_init (GladeEditorClass *klass)
 
 static void
 glade_editor_update_class_warning_cb (GladeWidget *widget,
-                                      GParamSpec *pspec,
+                                      GParamSpec  *pspec,
                                       GladeEditor *editor)
 {
   GladeEditorPrivate *priv = GLADE_EDITOR_PRIVATE (editor);
@@ -325,7 +325,7 @@ glade_editor_update_class_field (GladeEditor *editor)
 
 static void
 glade_editor_update_widget_name_cb (GladeWidget *widget,
-                                    GParamSpec *pspec,
+                                    GParamSpec  *pspec,
                                     GladeEditor *editor)
 {
   glade_editor_update_class_field (editor);
@@ -380,7 +380,7 @@ glade_editor_init (GladeEditor *editor)
 }
 
 static GtkWidget *
-glade_editor_get_editable_by_adaptor (GladeEditor *editor,
+glade_editor_get_editable_by_adaptor (GladeEditor        *editor,
                                       GladeWidgetAdaptor *adaptor,
                                       GladeEditorPageType type)
 {
@@ -442,7 +442,7 @@ hide_or_remove_visible_child (GtkContainer *container, gboolean remove)
 }
 
 static GtkWidget *
-glade_editor_load_editable_in_page (GladeEditor *editor,
+glade_editor_load_editable_in_page (GladeEditor        *editor,
                                     GladeWidgetAdaptor *adaptor,
                                     GladeEditorPageType type)
 {
@@ -515,7 +515,7 @@ glade_editor_load_widget_class (GladeEditor *editor,
 }
 
 static void
-glade_editor_close_cb (GladeProject * project, GladeEditor * editor)
+glade_editor_close_cb (GladeProject *project, GladeEditor *editor)
 {
   /* project we are viewing was closed,
    * detatch from editor.
@@ -538,8 +538,8 @@ glade_editor_removed_cb (GladeProject *project,
 
 
 static void
-glade_editor_load_editable (GladeEditor *editor,
-                            GladeWidget *widget,
+glade_editor_load_editable (GladeEditor        *editor,
+                            GladeWidget        *widget,
                             GladeEditorPageType type)
 {
   GtkWidget   *editable;
@@ -805,8 +805,8 @@ enum
 
 static void
 glade_editor_reset_toggled (GtkCellRendererToggle *cell,
-                            gchar *path_str,
-                            GtkTreeModel *model)
+                            gchar                 *path_str,
+                            GtkTreeModel          *model)
 {
   GtkTreePath *path = gtk_tree_path_new_from_string (path_str);
   GtkTreeIter iter;
@@ -956,7 +956,7 @@ glade_editor_populate_reset_view (GladeWidget *widget, GtkTreeView *tree_view)
 
 static gboolean
 glade_editor_reset_selection_changed_cb (GtkTreeSelection *selection,
-                                         GtkTextView *desc_view)
+                                         GtkTextView      *desc_view)
 {
   GtkTreeIter iter;
   GladeProperty *property = NULL;
@@ -987,9 +987,9 @@ glade_editor_reset_selection_changed_cb (GtkTreeSelection *selection,
 
 static gboolean
 glade_editor_reset_foreach_selection (GtkTreeModel *model,
-                                      GtkTreePath *path,
-                                      GtkTreeIter *iter,
-                                      gboolean select)
+                                      GtkTreePath  *path,
+                                      GtkTreeIter  *iter,
+                                      gboolean      select)
 {
   gboolean def;
 
@@ -1003,7 +1003,7 @@ glade_editor_reset_foreach_selection (GtkTreeModel *model,
 
 
 static void
-glade_editor_reset_select_all_clicked (GtkButton *button,
+glade_editor_reset_select_all_clicked (GtkButton   *button,
                                        GtkTreeView *tree_view)
 {
   GtkTreeModel *model = gtk_tree_view_get_model (tree_view);
@@ -1013,7 +1013,7 @@ glade_editor_reset_select_all_clicked (GtkButton *button,
 }
 
 static void
-glade_editor_reset_unselect_all_clicked (GtkButton *button,
+glade_editor_reset_unselect_all_clicked (GtkButton   *button,
                                          GtkTreeView *tree_view)
 {
   GtkTreeModel *model = gtk_tree_view_get_model (tree_view);
@@ -1024,9 +1024,9 @@ glade_editor_reset_unselect_all_clicked (GtkButton *button,
 
 static gboolean
 glade_editor_reset_accumulate_selected_props (GtkTreeModel *model,
-                                              GtkTreePath *path,
-                                              GtkTreeIter *iter,
-                                              GList **accum)
+                                              GtkTreePath  *path,
+                                              GtkTreeIter  *iter,
+                                              GList       **accum)
 {
   GladeProperty *property;
   gboolean enabled, def;

gladeui/glade-id-allocator.c

@@ -61,7 +61,7 @@ glade_id_allocator_new (void)
  * Frees @allocator and its associated memory
  */
 void
-glade_id_allocator_destroy (GladeIDAllocator * allocator)
+glade_id_allocator_destroy (GladeIDAllocator *allocator)
 {
   g_return_if_fail (allocator != NULL);
 
@@ -110,7 +110,7 @@ first_set_bit (guint32 word)
  * Returns:
  */
 guint
-glade_id_allocator_allocate (GladeIDAllocator * allocator)
+glade_id_allocator_allocate (GladeIDAllocator *allocator)
 {
   guint i;
 
@@ -148,7 +148,7 @@ glade_id_allocator_allocate (GladeIDAllocator * allocator)
  * TODO: write me
  */
 void
-glade_id_allocator_release (GladeIDAllocator * allocator, guint id)
+glade_id_allocator_release (GladeIDAllocator *allocator, guint id)
 {
   guint word_idx;
 

gladeui/glade-inspector.c

@@ -58,14 +58,14 @@
 			 		    GladeInspectorPrivate))
 
 
-static void     search_entry_text_inserted_cb (GtkEntry *entry,
-					       const gchar *text,
-					       gint length,
-					       gint *position,
+static void     search_entry_text_inserted_cb (GtkEntry       *entry,
+					       const gchar    *text,
+					       gint            length,
+					       gint           *position,
 					       GladeInspector *inspector);
-static void     search_entry_text_deleted_cb  (GtkEditable *editable,
-					       gint         start_pos,
-					       gint         end_pos,
+static void     search_entry_text_deleted_cb  (GtkEditable    *editable,
+					       gint            start_pos,
+					       gint            end_pos,
 					       GladeInspector *inspector);
 
 enum
@@ -102,22 +102,23 @@ static guint glade_inspector_signals[LAST_SIGNAL] = { 0 };
 static void glade_inspector_dispose (GObject *object);
 static void glade_inspector_finalize (GObject *object);
 static void add_columns (GtkTreeView *inspector);
-static void item_activated_cb (GtkTreeView *view,
-                               GtkTreePath *path,
+static void item_activated_cb (GtkTreeView       *view,
+                               GtkTreePath       *path,
                                GtkTreeViewColumn *column,
-                               GladeInspector *inspector);
+                               GladeInspector    *inspector);
 static void selection_changed_cb (GtkTreeSelection *selection,
-                                  GladeInspector *inspector);
-static gint button_press_cb (GtkWidget *widget,
+                                  GladeInspector   *inspector);
+static gint button_press_cb (GtkWidget      *widget,
                              GdkEventButton *event,
                              GladeInspector *inspector);
 
-G_DEFINE_TYPE (GladeInspector, glade_inspector, GTK_TYPE_BOX)
+G_DEFINE_TYPE_WITH_PRIVATE (GladeInspector, glade_inspector, GTK_TYPE_BOX)
 
 static void
-glade_inspector_set_property (GObject *object,
-			      guint property_id,
-			      const GValue *value, GParamSpec *pspec)
+glade_inspector_set_property (GObject      *object,
+			      guint         property_id,
+			      const GValue *value,
+                              GParamSpec   *pspec)
 {
   GladeInspector *inspector = GLADE_INSPECTOR (object);
 
@@ -133,9 +134,9 @@ glade_inspector_set_property (GObject *object,
 }
 
 static void
-glade_inspector_get_property (GObject *object,
-                              guint property_id,
-                              GValue *value,
+glade_inspector_get_property (GObject    *object,
+                              guint       property_id,
+                              GValue     *value,
                               GParamSpec *pspec)
 {
   GladeInspector *inspector = GLADE_INSPECTOR (object);
@@ -198,8 +199,6 @@ glade_inspector_class_init (GladeInspectorClass *klass)
   
   /* Install all properties */
   g_object_class_install_properties (object_class, N_PROPERTIES, properties);
-
-  g_type_class_add_private (klass, sizeof (GladeInspectorPrivate));
 }
 
 static gboolean
@@ -219,8 +218,8 @@ find_in_string_insensitive (const gchar *_haystack, const gchar *_needle)
 
 static gboolean
 glade_inspector_visible_func (GtkTreeModel *model,
-                              GtkTreeIter *parent,
-                              gpointer data)
+                              GtkTreeIter  *parent,
+                              gpointer      data)
 {
   GladeInspector *inspector = data;
   GladeInspectorPrivate *priv = inspector->priv;
@@ -302,10 +301,10 @@ reduce_string (gchar *str1,
 }
 
 static gboolean
-search_common_matches (GtkTreeModel        *model,
-		       GtkTreePath         *path,
-		       GtkTreeIter         *iter,
-		       CommonMatchData     *data)
+search_common_matches (GtkTreeModel    *model,
+		       GtkTreePath     *path,
+		       GtkTreeIter     *iter,
+		       CommonMatchData *data)
 {
   gchar *row_text = NULL;
   gboolean match;
@@ -400,10 +399,10 @@ search_complete_idle (GladeInspector *inspector)
 }
 
 static void
-search_entry_text_inserted_cb (GtkEntry *entry,
-                               const gchar *text,
-                               gint length,
-                               gint *position,
+search_entry_text_inserted_cb (GtkEntry       *entry,
+                               const gchar    *text,
+                               gint            length,
+                               gint           *position,
                                GladeInspector *inspector)
 {
   GladeInspectorPrivate *priv = inspector->priv;
@@ -416,9 +415,9 @@ search_entry_text_inserted_cb (GtkEntry *entry,
 }
 
 static void
-search_entry_text_deleted_cb (GtkEditable *editable,
-			      gint         start_pos,
-			      gint         end_pos,
+search_entry_text_deleted_cb (GtkEditable    *editable,
+			      gint            start_pos,
+			      gint            end_pos,
 			      GladeInspector *inspector)
 {
   GladeInspectorPrivate *priv = inspector->priv;
@@ -437,8 +436,8 @@ search_entry_text_deleted_cb (GtkEditable *editable,
 }
 
 static gboolean
-search_entry_key_press_event_cb (GtkEntry *entry,
-                                 GdkEventKey *event,
+search_entry_key_press_event_cb (GtkEntry       *entry,
+                                 GdkEventKey    *event,
                                  GladeInspector *inspector)
 {
   GladeInspectorPrivate *priv = inspector->priv;
@@ -534,8 +533,8 @@ search_entry_key_press_event_cb (GtkEntry *entry,
 }
 
 static gboolean
-search_entry_focus_in_cb (GtkWidget *entry,
-                          GdkEventFocus *event,
+search_entry_focus_in_cb (GtkWidget      *entry,
+                          GdkEventFocus  *event,
                           GladeInspector *inspector)
 {
   GladeInspectorPrivate *priv = inspector->priv;
@@ -547,8 +546,8 @@ search_entry_focus_in_cb (GtkWidget *entry,
 }
 
 static gboolean
-search_entry_focus_out_cb (GtkWidget *entry,
-                           GdkEventFocus *event,
+search_entry_focus_out_cb (GtkWidget      *entry,
+                           GdkEventFocus  *event,
                            GladeInspector *inspector)
 {
   GladeInspectorPrivate *priv = inspector->priv;
@@ -572,7 +571,7 @@ glade_inspector_init (GladeInspector *inspector)
   GtkWidget *sw;
   GtkTreeSelection *selection;
 
-  inspector->priv = priv = GLADE_INSPECTOR_GET_PRIVATE (inspector);
+  inspector->priv = priv = glade_inspector_get_instance_private (inspector);
 
   gtk_orientable_set_orientation (GTK_ORIENTABLE (inspector),
 				  GTK_ORIENTATION_VERTICAL);
@@ -665,7 +664,7 @@ glade_inspector_finalize (GObject *object)
 }
 
 static void
-project_selection_changed_cb (GladeProject *project,
+project_selection_changed_cb (GladeProject   *project,
                               GladeInspector *inspector)
 {
   GladeWidget *widget;
@@ -732,9 +731,9 @@ project_selection_changed_cb (GladeProject *project,
 
 static void
 selection_foreach_func (GtkTreeModel *model,
-                        GtkTreePath *path,
-                        GtkTreeIter *iter,
-                        GList **selection)
+                        GtkTreePath  *path,
+                        GtkTreeIter  *iter,
+                        GList       **selection)
 {
   GObject *object;
 
@@ -787,16 +786,16 @@ selection_changed_cb (GtkTreeSelection *selection, GladeInspector *inspector)
 }
 
 static void
-item_activated_cb (GtkTreeView *view,
-                   GtkTreePath *path,
+item_activated_cb (GtkTreeView       *view,
+                   GtkTreePath       *path,
                    GtkTreeViewColumn *column,
-                   GladeInspector *inspector)
+                   GladeInspector    *inspector)
 {
   g_signal_emit (inspector, glade_inspector_signals[ITEM_ACTIVATED], 0);
 }
 
 static gint
-button_press_cb (GtkWidget *widget,
+button_press_cb (GtkWidget      *widget,
                  GdkEventButton *event,
                  GladeInspector *inspector)
 {
@@ -846,10 +845,10 @@ button_press_cb (GtkWidget *widget,
 
 static void
 glade_inspector_warning_cell_data_func (GtkTreeViewColumn *column,
-					GtkCellRenderer *renderer,
-					GtkTreeModel *model,
-					GtkTreeIter *iter,
-					gpointer data)
+					GtkCellRenderer   *renderer,
+					GtkTreeModel      *model,
+					GtkTreeIter       *iter,
+					gpointer           data)
 {
   gchar *warning = NULL;
 
@@ -864,10 +863,10 @@ glade_inspector_warning_cell_data_func (GtkTreeViewColumn *column,
 
 static void
 glade_inspector_detail_cell_data_func (GtkTreeViewColumn *column,
-				       GtkCellRenderer *renderer,
-				       GtkTreeModel *model,
-				       GtkTreeIter *iter,
-				       gpointer data)
+				       GtkCellRenderer   *renderer,
+				       GtkTreeModel      *model,
+				       GtkTreeIter       *iter,
+				       gpointer           data)
 {
   gchar *type_name = NULL, *detail = NULL;
 

gladeui/glade-name-context.c

@@ -38,8 +38,6 @@ struct _GladeNameContext
   GHashTable *names;
 };
 
-
-
 GladeNameContext *
 glade_name_context_new (void)
 {
@@ -58,7 +56,7 @@ glade_name_context_new (void)
 }
 
 void
-glade_name_context_destroy (GladeNameContext * context)
+glade_name_context_destroy (GladeNameContext *context)
 {
   g_return_if_fail (context != NULL);
 
@@ -68,8 +66,8 @@ glade_name_context_destroy (GladeNameContext * context)
 }
 
 gchar *
-glade_name_context_new_name (GladeNameContext * context,
-                             const gchar * base_name)
+glade_name_context_new_name (GladeNameContext *context,
+                             const gchar      *base_name)
 {
   GladeIDAllocator *id_allocator;
   const gchar *number;
@@ -111,9 +109,9 @@ glade_name_context_new_name (GladeNameContext * context,
 }
 
 gchar *
-glade_name_context_dual_new_name (GladeNameContext * context,
-                                  GladeNameContext * another_context,
-                                  const gchar * base_name)
+glade_name_context_dual_new_name (GladeNameContext *context,
+                                  GladeNameContext *another_context,
+                                  const gchar      *base_name)
 {
   GladeIDAllocator *id_allocator;
   GList            *free_ids = NULL, *l;
@@ -172,7 +170,7 @@ glade_name_context_dual_new_name (GladeNameContext * context,
 }
 
 guint
-glade_name_context_n_names (GladeNameContext * context)
+glade_name_context_n_names (GladeNameContext *context)
 {
   g_return_val_if_fail (context != NULL, FALSE);
 
@@ -180,7 +178,7 @@ glade_name_context_n_names (GladeNameContext * context)
 }
 
 gboolean
-glade_name_context_has_name (GladeNameContext * context, const gchar * name)
+glade_name_context_has_name (GladeNameContext *context, const gchar *name)
 {
   g_return_val_if_fail (context != NULL, FALSE);
   g_return_val_if_fail (name && name[0], FALSE);
@@ -189,7 +187,7 @@ glade_name_context_has_name (GladeNameContext * context, const gchar * name)
 }
 
 gboolean
-glade_name_context_add_name (GladeNameContext * context, const gchar * name)
+glade_name_context_add_name (GladeNameContext *context, const gchar *name)
 {
   gboolean ret = FALSE;
 
@@ -207,7 +205,7 @@ glade_name_context_add_name (GladeNameContext * context, const gchar * name)
 }
 
 void
-glade_name_context_release_name (GladeNameContext * context, const gchar * name)
+glade_name_context_release_name (GladeNameContext *context, const gchar *name)
 {
 
   const gchar *first_number = name;

gladeui/glade-named-icon-chooser-dialog.c

@@ -33,10 +33,6 @@
 
 #define DEFAULT_SETTING_LIST_STANDARD_ONLY   TRUE
 
-#define GLADE_NAMED_ICON_CHOOSER_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o),     \
-							GLADE_TYPE_NAMED_ICON_CHOOSER_DIALOG, \
-							GladeNamedIconChooserDialogPrivate))
-
 enum
 {
   CONTEXTS_ID_COLUMN,
@@ -103,45 +99,46 @@ static GHashTable *standard_icon_quarks = NULL;
 
 static guint dialog_signals[LAST_SIGNAL] = { 0, };
 
+gchar *
+glade_named_icon_chooser_dialog_get_icon_name (GladeNamedIconChooserDialog *dialog);
 
-gchar
-    *glade_named_icon_chooser_dialog_get_icon_name (GladeNamedIconChooserDialog
-                                                    * dialog);
-
-void glade_named_icon_chooser_dialog_set_icon_name (GladeNamedIconChooserDialog
-                                                    * dialog,
-                                                    const gchar * icon_name);
+void
+glade_named_icon_chooser_dialog_set_icon_name (GladeNamedIconChooserDialog *dialog,
+                                               const gchar                 *icon_name);
 
 gboolean
-glade_named_icon_chooser_dialog_set_context (GladeNamedIconChooserDialog *
-                                             dialog, const gchar * context);
+glade_named_icon_chooser_dialog_set_context (GladeNamedIconChooserDialog *dialog,
+                                             const gchar                 *context);
 
-gchar *glade_named_icon_chooser_dialog_get_context (GladeNamedIconChooserDialog
-                                                    * dialog);
+gchar *
+glade_named_icon_chooser_dialog_get_context (GladeNamedIconChooserDialog *dialog);
 
-static gboolean should_respond (GladeNamedIconChooserDialog * dialog);
+static gboolean should_respond (GladeNamedIconChooserDialog *dialog);
 
-static void filter_icons_model (GladeNamedIconChooserDialog * dialog);
+static void filter_icons_model (GladeNamedIconChooserDialog *dialog);
 
-static gboolean scan_for_name_func (GtkTreeModel * model,
-                                    GtkTreePath * path,
-                                    GtkTreeIter * iter, gpointer data);
+static gboolean scan_for_name_func (GtkTreeModel *model,
+                                    GtkTreePath  *path,
+                                    GtkTreeIter  *iter,
+                                    gpointer      data);
 
-static gboolean scan_for_context_func (GtkTreeModel * model,
-                                       GtkTreePath * path,
-                                       GtkTreeIter * iter, gpointer data);
+static gboolean scan_for_context_func (GtkTreeModel *model,
+                                       GtkTreePath  *path,
+                                       GtkTreeIter  *iter,
+                                       gpointer      data);
 
-static void settings_load (GladeNamedIconChooserDialog * dialog);
+static void settings_load (GladeNamedIconChooserDialog *dialog);
 
-static void settings_save (GladeNamedIconChooserDialog * dialog);
+static void settings_save (GladeNamedIconChooserDialog *dialog);
 
 
-G_DEFINE_TYPE (GladeNamedIconChooserDialog, glade_named_icon_chooser_dialog,
-               GTK_TYPE_DIALOG);
+G_DEFINE_TYPE_WITH_PRIVATE (GladeNamedIconChooserDialog,
+                            glade_named_icon_chooser_dialog,
+                            GTK_TYPE_DIALOG);
 
 
 static void
-entry_set_name (GladeNamedIconChooserDialog * dialog, const gchar * name)
+entry_set_name (GladeNamedIconChooserDialog *dialog, const gchar *name)
 {
   /* Must disable completion before setting text, in order to avoid
    * spurious warnings (possible GTK+ bug).
@@ -155,7 +152,7 @@ entry_set_name (GladeNamedIconChooserDialog * dialog, const gchar * name)
 }
 
 static GtkIconTheme *
-get_icon_theme_for_widget (GtkWidget * widget)
+get_icon_theme_for_widget (GtkWidget *widget)
 {
   if (gtk_widget_has_screen (widget))
     return gtk_icon_theme_get_for_screen (gtk_widget_get_screen (widget));
@@ -184,9 +181,10 @@ is_well_formed (const gchar * name)
 }
 
 static void
-check_entry_text (GladeNamedIconChooserDialog * dialog,
-                  gchar ** name_ret,
-                  gboolean * is_wellformed_ret, gboolean * is_empty_ret)
+check_entry_text (GladeNamedIconChooserDialog *dialog,
+                  gchar                      **name_ret,
+                  gboolean                    *is_wellformed_ret,
+                  gboolean                    *is_empty_ret)
 {
   if (strlen (gtk_entry_get_text (GTK_ENTRY (dialog->priv->entry))) == 0)
     {
@@ -209,18 +207,19 @@ check_entry_text (GladeNamedIconChooserDialog * dialog,
 }
 
 static void
-changed_text_handler (GtkEditable * editable,
-                      GladeNamedIconChooserDialog * dialog)
+changed_text_handler (GtkEditable                 *editable,
+                      GladeNamedIconChooserDialog *dialog)
 {
   g_signal_emit_by_name (dialog, "selection-changed", NULL);
 }
 
 /* ensure that only valid text can be inserted into entry */
 static void
-insert_text_handler (GtkEditable * editable,
-                     const gchar * text,
-                     gint length,
-                     gint * position, GladeNamedIconChooserDialog * dialog)
+insert_text_handler (GtkEditable                 *editable,
+                     const gchar                 *text,
+                     gint                         length,
+                     gint                        *position,
+                     GladeNamedIconChooserDialog *dialog)
 {
   if (is_well_formed (text))
     {
@@ -256,8 +255,8 @@ typedef struct
 } ForEachFuncData;
 
 void
-glade_named_icon_chooser_dialog_set_icon_name (GladeNamedIconChooserDialog *
-                                               dialog, const gchar * name)
+glade_named_icon_chooser_dialog_set_icon_name (GladeNamedIconChooserDialog *dialog, 
+                                               const gchar                 *name)
 {
   ForEachFuncData *data;
   gboolean located_in_theme;
@@ -322,8 +321,8 @@ glade_named_icon_chooser_dialog_set_icon_name (GladeNamedIconChooserDialog *
 }
 
 gboolean
-glade_named_icon_chooser_dialog_set_context (GladeNamedIconChooserDialog *
-                                             dialog, const gchar * name)
+glade_named_icon_chooser_dialog_set_context (GladeNamedIconChooserDialog *dialog,
+                                             const gchar                 *name)
 {
   ForEachFuncData *data;
 
@@ -353,8 +352,7 @@ glade_named_icon_chooser_dialog_set_context (GladeNamedIconChooserDialog *
 }
 
 gchar *
-glade_named_icon_chooser_dialog_get_context (GladeNamedIconChooserDialog *
-                                             dialog)
+glade_named_icon_chooser_dialog_get_context (GladeNamedIconChooserDialog *dialog)
 {
   GtkTreeSelection *sel;
   GtkTreeIter iter;
@@ -382,7 +380,7 @@ glade_named_icon_chooser_dialog_get_context (GladeNamedIconChooserDialog *
 }
 
 static gchar *
-get_icon_name_from_selection (GladeNamedIconChooserDialog * dialog)
+get_icon_name_from_selection (GladeNamedIconChooserDialog *dialog)
 {
   GtkTreeIter iter;
   GtkTreeModel *model;
@@ -397,8 +395,7 @@ get_icon_name_from_selection (GladeNamedIconChooserDialog * dialog)
 }
 
 gchar *
-glade_named_icon_chooser_dialog_get_icon_name (GladeNamedIconChooserDialog *
-                                               dialog)
+glade_named_icon_chooser_dialog_get_icon_name (GladeNamedIconChooserDialog *dialog)
 {
   GtkWidget *current_focus;
   gchar *name;
@@ -444,7 +441,7 @@ glade_named_icon_chooser_dialog_get_icon_name (GladeNamedIconChooserDialog *
 }
 
 static void
-set_busy_cursor (GladeNamedIconChooserDialog * dialog, gboolean busy)
+set_busy_cursor (GladeNamedIconChooserDialog *dialog, gboolean busy)
 {
   GdkDisplay *display;
   GdkCursor *cursor;
@@ -504,10 +501,10 @@ populate_icon_contexts_model (void)
 }
 
 static void
-icons_row_activated_cb (GtkTreeView * view,
-                        GtkTreePath * path,
-                        GtkTreeViewColumn * column,
-                        GladeNamedIconChooserDialog * dialog)
+icons_row_activated_cb (GtkTreeView                 *view,
+                        GtkTreePath                 *path,
+                        GtkTreeViewColumn           *column,
+                        GladeNamedIconChooserDialog *dialog)
 {
   g_signal_emit_by_name (dialog, "icon-activated", NULL);
 }
@@ -538,10 +535,10 @@ icons_selection_changed_cb (GtkTreeSelection * selection,
 }
 
 static void
-contexts_row_activated_cb (GtkTreeView * view,
-                           GtkTreePath * cpath,
-                           GtkTreeViewColumn * column,
-                           GladeNamedIconChooserDialog * dialog)
+contexts_row_activated_cb (GtkTreeView                 *view,
+                           GtkTreePath                 *cpath,
+                           GtkTreeViewColumn           *column,
+                           GladeNamedIconChooserDialog *dialog)
 {
   GtkTreeIter iter;
   GtkTreePath *path;
@@ -565,8 +562,8 @@ contexts_row_activated_cb (GtkTreeView * view,
 }
 
 static void
-contexts_selection_changed_cb (GtkTreeSelection * selection,
-                               GladeNamedIconChooserDialog * dialog)
+contexts_selection_changed_cb (GtkTreeSelection            *selection,
+                               GladeNamedIconChooserDialog *dialog)
 {
   GtkTreeIter iter;
   GtkTreeModel *model;
@@ -593,7 +590,7 @@ contexts_selection_changed_cb (GtkTreeSelection * selection,
 }
 
 static gboolean
-row_separator_func (GtkTreeModel * model, GtkTreeIter * iter, gpointer unused)
+row_separator_func (GtkTreeModel *model, GtkTreeIter *iter, gpointer unused)
 {
   gboolean retval;
   gchar *name, *title;
@@ -611,7 +608,7 @@ row_separator_func (GtkTreeModel * model, GtkTreeIter * iter, gpointer unused)
 }
 
 static GtkWidget *
-create_contexts_view (GladeNamedIconChooserDialog * dialog)
+create_contexts_view (GladeNamedIconChooserDialog *dialog)
 {
   GtkTreeView *view;
   GtkTreeViewColumn *column;
@@ -656,7 +653,7 @@ create_contexts_view (GladeNamedIconChooserDialog * dialog)
 
 /* filters the icons model based on the current state */
 static void
-filter_icons_model (GladeNamedIconChooserDialog * dialog)
+filter_icons_model (GladeNamedIconChooserDialog *dialog)
 {
 
   set_busy_cursor (dialog, TRUE);
@@ -680,8 +677,9 @@ filter_icons_model (GladeNamedIconChooserDialog * dialog)
 }
 
 static gboolean
-filter_visible_func (GtkTreeModel * model,
-                     GtkTreeIter * iter, GladeNamedIconChooserDialog * dialog)
+filter_visible_func (GtkTreeModel                *model,
+                     GtkTreeIter                 *iter,
+                     GladeNamedIconChooserDialog *dialog)
 {
   gboolean standard;
   gint context_id;
@@ -701,10 +699,11 @@ filter_visible_func (GtkTreeModel * model,
 
 
 static gboolean
-search_equal_func (GtkTreeModel * model,
-                   gint column,
-                   const gchar * key,
-                   GtkTreeIter * iter, GladeNamedIconChooserDialog * dialog)
+search_equal_func (GtkTreeModel                *model,
+                   gint                         column,
+                   const gchar                 *key,
+                   GtkTreeIter                 *iter,
+                   GladeNamedIconChooserDialog *dialog)
 {
   gchar *name;
   gboolean retval;
@@ -720,9 +719,10 @@ search_equal_func (GtkTreeModel * model,
 }
 
 static gboolean
-scan_for_context_func (GtkTreeModel * model,
-                       GtkTreePath * path,
-                       GtkTreeIter * iter, gpointer user_data)
+scan_for_context_func (GtkTreeModel *model,
+                       GtkTreePath  *path,
+                       GtkTreeIter  *iter,
+                       gpointer      user_data)
 {
   ForEachFuncData *data = (ForEachFuncData *) user_data;
   GtkTreeSelection *selection =
@@ -769,8 +769,10 @@ scan_for_context_func (GtkTreeModel * model,
 }
 
 gboolean
-scan_for_name_func (GtkTreeModel * model,
-                    GtkTreePath * path, GtkTreeIter * iter, gpointer user_data)
+scan_for_name_func (GtkTreeModel *model,
+                    GtkTreePath  *path,
+                    GtkTreeIter  *iter,
+                    gpointer      user_data)
 {
   ForEachFuncData *data = (ForEachFuncData *) user_data;
   gchar *name = NULL;
@@ -814,7 +816,7 @@ scan_for_name_func (GtkTreeModel * model,
 }
 
 static void
-centre_selected_row (GladeNamedIconChooserDialog * dialog)
+centre_selected_row (GladeNamedIconChooserDialog *dialog)
 {
   GList *l;
 
@@ -845,7 +847,7 @@ centre_selected_row (GladeNamedIconChooserDialog * dialog)
 }
 
 static void
-select_first_row (GladeNamedIconChooserDialog * dialog)
+select_first_row (GladeNamedIconChooserDialog *dialog)
 {
   GtkTreePath *path;
 
@@ -859,7 +861,7 @@ select_first_row (GladeNamedIconChooserDialog * dialog)
 }
 
 static void
-pending_select_name_process (GladeNamedIconChooserDialog * dialog)
+pending_select_name_process (GladeNamedIconChooserDialog *dialog)
 {
   ForEachFuncData *data;
 
@@ -897,7 +899,7 @@ pending_select_name_process (GladeNamedIconChooserDialog * dialog)
 }
 
 static gboolean
-is_standard_icon_name (const gchar * icon_name)
+is_standard_icon_name (const gchar *icon_name)
 {
   GQuark quark;
 
@@ -912,7 +914,7 @@ is_standard_icon_name (const gchar * icon_name)
 }
 
 static void
-cleanup_after_load (GladeNamedIconChooserDialog * dialog)
+cleanup_after_load (GladeNamedIconChooserDialog *dialog)
 {
   dialog->priv->load_id = 0;
 
@@ -922,7 +924,7 @@ cleanup_after_load (GladeNamedIconChooserDialog * dialog)
 }
 
 static void
-chooser_set_model (GladeNamedIconChooserDialog * dialog)
+chooser_set_model (GladeNamedIconChooserDialog *dialog)
 {
 
   /* filter model */
@@ -957,13 +959,13 @@ typedef struct
 } IconData;
 
 static gint
-icon_data_compare (IconData * a, IconData * b)
+icon_data_compare (IconData *a, IconData *b)
 {
   return g_ascii_strcasecmp (a->name, b->name);
 }
 
 static gboolean
-reload_icons (GladeNamedIconChooserDialog * dialog)
+reload_icons (GladeNamedIconChooserDialog *dialog)
 {
   GtkListStore *store = dialog->priv->icons_store;
   GtkTreeIter iter;
@@ -1020,7 +1022,7 @@ reload_icons (GladeNamedIconChooserDialog * dialog)
 }
 
 static void
-change_icon_theme (GladeNamedIconChooserDialog * dialog)
+change_icon_theme (GladeNamedIconChooserDialog *dialog)
 {
   if (dialog->priv->icon_theme == NULL)
     dialog->priv->icon_theme = get_icon_theme_for_widget (GTK_WIDGET (dialog));
@@ -1038,8 +1040,8 @@ change_icon_theme (GladeNamedIconChooserDialog * dialog)
 }
 
 static void
-glade_named_icon_chooser_dialog_screen_changed (GtkWidget * widget,
-                                                GdkScreen * previous_screen)
+glade_named_icon_chooser_dialog_screen_changed (GtkWidget *widget,
+                                                GdkScreen *previous_screen)
 {
   GladeNamedIconChooserDialog *dialog;
 
@@ -1056,7 +1058,7 @@ glade_named_icon_chooser_dialog_screen_changed (GtkWidget * widget,
 }
 
 static GtkWidget *
-create_icons_view (GladeNamedIconChooserDialog * dialog)
+create_icons_view (GladeNamedIconChooserDialog *dialog)
 {
   GtkTreeView *view;
   GtkTreeViewColumn *column;
@@ -1124,7 +1126,7 @@ create_icons_view (GladeNamedIconChooserDialog * dialog)
 
 /* sets the 'list-standard' state and refilters the icons model */
 static void
-button_toggled (GtkToggleButton * button, GladeNamedIconChooserDialog * dialog)
+button_toggled (GtkToggleButton *button, GladeNamedIconChooserDialog *dialog)
 {
   dialog->priv->settings_list_standard = gtk_toggle_button_get_active (button);
 
@@ -1154,8 +1156,8 @@ create_standard_icon_quarks (void)
 }
 
 static void
-glade_named_icon_chooser_dialog_style_set (GtkWidget * widget,
-                                           GtkStyle * previous_style)
+glade_named_icon_chooser_dialog_style_set (GtkWidget *widget,
+                                           GtkStyle  *previous_style)
 {
   if (gtk_widget_has_screen (widget) && gtk_widget_get_mapped (widget))
     change_icon_theme (GLADE_NAMED_ICON_CHOOSER_DIALOG (widget));
@@ -1165,7 +1167,7 @@ glade_named_icon_chooser_dialog_style_set (GtkWidget * widget,
  * hidden unless we decide otherwise, like the list-standard-icons-only checkbox.
  */
 static void
-glade_named_icon_chooser_dialog_show_all (GtkWidget * widget)
+glade_named_icon_chooser_dialog_show_all (GtkWidget *widget)
 {
   gtk_widget_show (widget);
 }
@@ -1174,8 +1176,7 @@ glade_named_icon_chooser_dialog_show_all (GtkWidget * widget)
  * widget on our toplevel.  See glade_named_icon_chooser_dialog_hierarchy_changed()
  */
 static void
-glade_named_icon_chooser_dialog_set_focus (GtkWindow * window,
-                                           GtkWidget * focus)
+glade_named_icon_chooser_dialog_set_focus (GtkWindow *window, GtkWidget *focus)
 {
 
   GTK_WINDOW_CLASS (glade_named_icon_chooser_dialog_parent_class)->
@@ -1186,7 +1187,7 @@ glade_named_icon_chooser_dialog_set_focus (GtkWindow * window,
 }
 
 static void
-glade_named_icon_chooser_dialog_finalize (GObject * object)
+glade_named_icon_chooser_dialog_finalize (GObject *object)
 {
   GladeNamedIconChooserDialog *dialog =
       GLADE_NAMED_ICON_CHOOSER_DIALOG (object);
@@ -1198,11 +1199,11 @@ glade_named_icon_chooser_dialog_finalize (GObject * object)
     }
 
   G_OBJECT_CLASS (glade_named_icon_chooser_dialog_parent_class)->
-      finalize (object);
+    finalize (object);
 }
 
 static void
-glade_named_icon_chooser_dialog_map (GtkWidget * widget)
+glade_named_icon_chooser_dialog_map (GtkWidget *widget)
 {
   GladeNamedIconChooserDialog *dialog =
       GLADE_NAMED_ICON_CHOOSER_DIALOG (widget);
@@ -1218,7 +1219,7 @@ glade_named_icon_chooser_dialog_map (GtkWidget * widget)
 }
 
 static void
-glade_named_icon_chooser_dialog_unmap (GtkWidget * widget)
+glade_named_icon_chooser_dialog_unmap (GtkWidget *widget)
 {
   GladeNamedIconChooserDialog *dialog =
       GLADE_NAMED_ICON_CHOOSER_DIALOG (widget);
@@ -1233,7 +1234,7 @@ glade_named_icon_chooser_dialog_unmap (GtkWidget * widget)
  * to be fully painted before loading begins
  */
 static gboolean
-glade_named_icon_chooser_dialog_draw (GtkWidget * widget, cairo_t * cr)
+glade_named_icon_chooser_dialog_draw (GtkWidget *widget, cairo_t *cr)
 {
   GladeNamedIconChooserDialog *dialog =
       GLADE_NAMED_ICON_CHOOSER_DIALOG (widget);
@@ -1252,7 +1253,7 @@ glade_named_icon_chooser_dialog_draw (GtkWidget * widget, cairo_t * cr)
 }
 
 static void
-response_cb (GtkDialog * dialog, gint response_id)
+response_cb (GtkDialog *dialog, gint response_id)
 {
   /* Act only on response IDs we recognize */
   if (!(response_id == GTK_RESPONSE_ACCEPT
@@ -1271,7 +1272,7 @@ response_cb (GtkDialog * dialog, gint response_id)
  * make the dialog emit a valid response signal
  */
 static void
-icon_activated_cb (GladeNamedIconChooserDialog * dialog)
+icon_activated_cb (GladeNamedIconChooserDialog *dialog)
 {
   GList *children, *l;
 
@@ -1307,7 +1308,7 @@ icon_activated_cb (GladeNamedIconChooserDialog * dialog)
  * make the affirmative response button insensitive when the selection is empty 
  */
 static void
-selection_changed_cb (GladeNamedIconChooserDialog * dialog)
+selection_changed_cb (GladeNamedIconChooserDialog *dialog)
 {
   GList *children, *l;
   gchar *icon_name;
@@ -1343,7 +1344,7 @@ selection_changed_cb (GladeNamedIconChooserDialog * dialog)
 }
 
 static void
-glade_named_icon_chooser_dialog_init (GladeNamedIconChooserDialog * dialog)
+glade_named_icon_chooser_dialog_init (GladeNamedIconChooserDialog *dialog)
 {
   GtkWidget *contents;
   GtkWidget *hbox;
@@ -1355,7 +1356,7 @@ glade_named_icon_chooser_dialog_init (GladeNamedIconChooserDialog * dialog)
   GtkWidget *action_area;
   GtkSizeGroup *group;
 
-  dialog->priv = GLADE_NAMED_ICON_CHOOSER_DIALOG_GET_PRIVATE (dialog);
+  dialog->priv = glade_named_icon_chooser_dialog_get_instance_private (dialog);
 
   dialog->priv->filter_model = NULL;
   dialog->priv->icons_store = NULL;
@@ -1505,13 +1506,10 @@ glade_named_icon_chooser_dialog_init (GladeNamedIconChooserDialog * dialog)
                                                   G_TYPE_UINT,
                                                   G_TYPE_BOOLEAN,
                                                   G_TYPE_STRING);
-
-
 }
 
 static void
-glade_named_icon_chooser_dialog_class_init (GladeNamedIconChooserDialogClass *
-                                            klass)
+glade_named_icon_chooser_dialog_class_init (GladeNamedIconChooserDialogClass *klass)
 {
   GObjectClass *object_class;
   GtkWidgetClass *widget_class;
@@ -1565,13 +1563,10 @@ glade_named_icon_chooser_dialog_class_init (GladeNamedIconChooserDialogClass *
                     G_STRUCT_OFFSET (GladeNamedIconChooserDialogClass,
                                      selection_changed), NULL, NULL,
                     g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-
-
-  g_type_class_add_private (klass, sizeof (GladeNamedIconChooserDialogPrivate));
 }
 
 static gboolean
-should_respond (GladeNamedIconChooserDialog * dialog)
+should_respond (GladeNamedIconChooserDialog *dialog)
 {
   gchar *icon_name;
 
@@ -1600,7 +1595,7 @@ get_config_dirname (void)
 
 /* loads the configuration settings */
 static void
-settings_load (GladeNamedIconChooserDialog * dialog)
+settings_load (GladeNamedIconChooserDialog *dialog)
 {
   GKeyFile *keyfile;
   gboolean success, boolean_value;
@@ -1643,7 +1638,7 @@ settings_load (GladeNamedIconChooserDialog * dialog)
 
 /* creates a GKeyFile based on the current settings */
 static GKeyFile *
-settings_to_keyfile (GladeNamedIconChooserDialog * dialog)
+settings_to_keyfile (GladeNamedIconChooserDialog *dialog)
 {
   GKeyFile *keyfile;
   gchar *filename;
@@ -1666,7 +1661,7 @@ settings_to_keyfile (GladeNamedIconChooserDialog * dialog)
 
 /* serializes the the current configuration to the config file */
 static void
-settings_save (GladeNamedIconChooserDialog * dialog)
+settings_save (GladeNamedIconChooserDialog *dialog)
 {
   GKeyFile *keyfile;
   gchar *contents;
@@ -1716,10 +1711,10 @@ out:
 }
 
 static GtkWidget *
-glade_named_icon_chooser_dialog_new_valist (const gchar * title,
-                                            GtkWindow * parent,
-                                            const gchar * first_button_text,
-                                            va_list varargs)
+glade_named_icon_chooser_dialog_new_valist (const gchar *title,
+                                            GtkWindow   *parent,
+                                            const gchar *first_button_text,
+                                            va_list      varargs)
 {
   GtkWidget *result;
   const char *button_text = first_button_text;
@@ -1752,9 +1747,10 @@ glade_named_icon_chooser_dialog_new_valist (const gchar * title,
  * Return value: a new #GladeNamedIconChooserDialog
  */
 GtkWidget *
-glade_named_icon_chooser_dialog_new (const gchar * title,
-                                     GtkWindow * parent,
-                                     const gchar * first_button_text, ...)
+glade_named_icon_chooser_dialog_new (const gchar *title,
+                                     GtkWindow   *parent,
+                                     const gchar *first_button_text,
+                                     ...)
 {
   GtkWidget *result;
   va_list varargs;

gladeui/glade-object-stub.c

@@ -35,8 +35,6 @@ struct _GladeObjectStubPrivate
   GladeXmlNode *node;
 };
 
-#define GLADE_OBJECT_STUB_PRIVATE(o)  (G_TYPE_INSTANCE_GET_PRIVATE ((o), GLADE_TYPE_OBJECT_STUB, GladeObjectStubPrivate))
-
 enum
 {
   PROP_0,
@@ -46,7 +44,7 @@ enum
 };
 
 
-G_DEFINE_TYPE (GladeObjectStub, glade_object_stub, GTK_TYPE_INFO_BAR);
+G_DEFINE_TYPE_WITH_PRIVATE (GladeObjectStub, glade_object_stub, GTK_TYPE_INFO_BAR);
 
 #define RESPONSE_DELETE 1
 #define RESPONSE_DELETE_ALL 2
@@ -85,7 +83,7 @@ on_infobar_response (GladeObjectStub *stub, gint response_id)
 static void
 glade_object_stub_init (GladeObjectStub *object)
 {
-  GladeObjectStubPrivate *priv = GLADE_OBJECT_STUB_PRIVATE (object);
+  GladeObjectStubPrivate *priv = glade_object_stub_get_instance_private (object);
   GtkWidget *label = gtk_label_new (NULL);
 
   object->priv = priv;
@@ -139,7 +137,10 @@ glade_object_stub_refresh_text (GladeObjectStub *stub)
 }
 
 static void
-glade_object_stub_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
+glade_object_stub_set_property (GObject      *object,
+                                guint         prop_id,
+                                const GValue *value,
+                                GParamSpec   *pspec)
 {
   GladeObjectStubPrivate *priv;
   GladeObjectStub *stub;
@@ -167,7 +168,10 @@ glade_object_stub_set_property (GObject *object, guint prop_id, const GValue *va
 }
 
 static void
-glade_object_stub_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
+glade_object_stub_get_property (GObject    *object,
+                                guint       prop_id,
+                                GValue     *value,
+                                GParamSpec *pspec)
 {
   GladeObjectStubPrivate *priv;
   
@@ -207,8 +211,6 @@ glade_object_stub_class_init (GladeObjectStubClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (GladeObjectStubPrivate));
-
   object_class->finalize = glade_object_stub_finalize;
   object_class->set_property = glade_object_stub_set_property;
   object_class->get_property = glade_object_stub_get_property;

gladeui/glade-palette.c

@@ -52,10 +52,6 @@
 #include <glib/gi18n-lib.h>
 #include <gdk/gdk.h>
 
-#define GLADE_PALETTE_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object),\
-					  GLADE_TYPE_PALETTE,                   \
-					  GladePalettePrivate))
-
 struct _GladePalettePrivate
 {
   const GList *catalogs;        /* List of widget catalogs */
@@ -95,12 +91,10 @@ static guint glade_palette_signals[LAST_SIGNAL] = { 0 };
 
 static void glade_palette_append_item_group (GladePalette        *palette,
                                              GladeWidgetGroup    *group);
-static void glade_palette_update_appearance (GladePalette        *palette);
-
 static void palette_item_toggled_cb         (GtkToggleToolButton *button, 
 					     GladePalette        *palette);
 
-G_DEFINE_TYPE (GladePalette, glade_palette, GTK_TYPE_BOX)
+G_DEFINE_TYPE_WITH_PRIVATE (GladePalette, glade_palette, GTK_TYPE_BOX)
 
 
 /*******************************************************
@@ -146,7 +140,7 @@ palette_item_refresh_cb (GladePalette *palette,
 }
 
 static void
-glade_palette_refresh (GladePalette * palette)
+glade_palette_refresh (GladePalette *palette)
 {
   g_return_if_fail (GLADE_IS_PALETTE (palette));
 
@@ -313,7 +307,7 @@ palette_item_button_press_cb (GtkWidget      *button,
  *          Building Widgets/Populating catalog        *
  *******************************************************/
 static GtkWidget *
-glade_palette_new_item (GladePalette * palette, GladeWidgetAdaptor * adaptor)
+glade_palette_new_item (GladePalette *palette, GladeWidgetAdaptor *adaptor)
 {
   GtkWidget *item, *button, *label, *box;
 
@@ -362,7 +356,7 @@ glade_palette_new_item (GladePalette * palette, GladeWidgetAdaptor * adaptor)
 }
 
 static GtkWidget *
-glade_palette_new_item_group (GladePalette * palette, GladeWidgetGroup * group)
+glade_palette_new_item_group (GladePalette *palette, GladeWidgetGroup *group)
 {
   GtkWidget *item_group, *item, *label;
   GList *l;
@@ -404,8 +398,7 @@ glade_palette_new_item_group (GladePalette * palette, GladeWidgetGroup * group)
 }
 
 static void
-glade_palette_append_item_group (GladePalette * palette,
-                                 GladeWidgetGroup * group)
+glade_palette_append_item_group (GladePalette *palette, GladeWidgetGroup *group)
 {
   GladePalettePrivate *priv = palette->priv;
   GtkWidget *item_group;
@@ -415,7 +408,7 @@ glade_palette_append_item_group (GladePalette * palette,
 }
 
 static void
-glade_palette_populate (GladePalette * palette)
+glade_palette_populate (GladePalette *palette)
 {
   GList *l;
 
@@ -436,7 +429,7 @@ glade_palette_populate (GladePalette * palette)
 }
 
 static GtkWidget *
-glade_palette_create_selector_button (GladePalette * palette)
+glade_palette_create_selector_button (GladePalette *palette)
 {
   GtkWidget *selector;
   GtkWidget *image;
@@ -471,15 +464,16 @@ glade_palette_create_selector_button (GladePalette * palette)
  * hidden unless we decide otherwise, like the hidden selector button.
  */
 static void
-glade_palette_show_all (GtkWidget * widget)
+glade_palette_show_all (GtkWidget *widget)
 {
   gtk_widget_show (widget);
 }
 
 static void
-glade_palette_set_property (GObject * object,
-                            guint prop_id,
-                            const GValue * value, GParamSpec * pspec)
+glade_palette_set_property (GObject      *object,
+                            guint         prop_id,
+                            const GValue *value,
+                            GParamSpec   *pspec)
 {
   GladePalette *palette = GLADE_PALETTE (object);
 
@@ -506,8 +500,10 @@ glade_palette_set_property (GObject * object,
 }
 
 static void
-glade_palette_get_property (GObject * object,
-                            guint prop_id, GValue * value, GParamSpec * pspec)
+glade_palette_get_property (GObject    *object,
+                            guint       prop_id,
+                            GValue     *value, 
+                            GParamSpec *pspec)
 {
   GladePalette *palette = GLADE_PALETTE (object);
   GladePalettePrivate *priv = palette->priv;
@@ -534,7 +530,7 @@ glade_palette_get_property (GObject * object,
 }
 
 static void
-glade_palette_dispose (GObject * object)
+glade_palette_dispose (GObject *object)
 {
   GladePalettePrivate *priv;
 
@@ -548,7 +544,7 @@ glade_palette_dispose (GObject * object)
 }
 
 static void
-glade_palette_finalize (GObject * object)
+glade_palette_finalize (GObject *object)
 {
   GladePalettePrivate *priv;
 
@@ -560,38 +556,7 @@ glade_palette_finalize (GObject * object)
 }
 
 static void
-glade_palette_update_appearance (GladePalette * palette)
-{
-  GladePalettePrivate *priv;
-  GtkToolbarStyle style;
-  GtkIconSize size;
-
-  priv = palette->priv;
-
-  size = priv->use_small_item_icons ? GTK_ICON_SIZE_MENU : GTK_ICON_SIZE_BUTTON;
-
-  switch (priv->item_appearance)
-    {
-      case GLADE_ITEM_ICON_AND_LABEL:
-        style = GTK_TOOLBAR_BOTH_HORIZ;
-        break;
-      case GLADE_ITEM_ICON_ONLY:
-        style = GTK_TOOLBAR_ICONS;
-        break;
-      case GLADE_ITEM_LABEL_ONLY:
-        style = GTK_TOOLBAR_TEXT;
-        break;
-      default:
-        g_assert_not_reached ();
-        break;
-    }
-
-  gtk_tool_palette_set_icon_size (GTK_TOOL_PALETTE (priv->toolpalette), size);
-  gtk_tool_palette_set_style (GTK_TOOL_PALETTE (priv->toolpalette), style);
-}
-
-static void
-glade_palette_class_init (GladePaletteClass * klass)
+glade_palette_class_init (GladePaletteClass *klass)
 {
   GObjectClass *object_class;
   GtkWidgetClass *widget_class;
@@ -644,12 +609,10 @@ glade_palette_class_init (GladePaletteClass * klass)
 
   /* Install all properties */
   g_object_class_install_properties (object_class, N_PROPERTIES, properties);
-
-  g_type_class_add_private (object_class, sizeof (GladePalettePrivate));
 }
 
 static void
-glade_palette_init (GladePalette * palette)
+glade_palette_init (GladePalette *palette)
 {
   GladePalettePrivate *priv;
   GtkWidget           *sw;
@@ -657,7 +620,7 @@ glade_palette_init (GladePalette * palette)
   gtk_orientable_set_orientation (GTK_ORIENTABLE (palette),
 				  GTK_ORIENTATION_VERTICAL);
 
-  priv = palette->priv = GLADE_PALETTE_GET_PRIVATE (palette);
+  priv = palette->priv = glade_palette_get_instance_private (palette);
 
   priv->button_table = g_hash_table_new (g_str_hash, g_str_equal);
 
@@ -677,7 +640,11 @@ glade_palette_init (GladePalette * palette)
 
   /* The GtkToolPalette */
   priv->toolpalette = gtk_tool_palette_new ();
-
+  gtk_tool_palette_set_style (GTK_TOOL_PALETTE (priv->toolpalette),
+                              GTK_TOOLBAR_ICONS);
+  gtk_tool_palette_set_icon_size (GTK_TOOL_PALETTE (priv->toolpalette),
+                                  GTK_ICON_SIZE_LARGE_TOOLBAR);
+  
   sw = gtk_scrolled_window_new (NULL, NULL);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                   GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
@@ -689,9 +656,6 @@ glade_palette_init (GladePalette * palette)
 
   gtk_widget_show (sw);
   gtk_widget_show (priv->toolpalette);
-
-  glade_palette_update_appearance (palette);
-
   gtk_widget_set_no_show_all (GTK_WIDGET (palette), TRUE);
 
   glade_palette_populate (palette);
@@ -732,8 +696,7 @@ glade_palette_get_project (GladePalette *palette)
 }
 
 void
-glade_palette_set_project (GladePalette *palette,
-			   GladeProject *project)
+glade_palette_set_project (GladePalette *palette, GladeProject *project)
 {
   g_return_if_fail (GLADE_IS_PALETTE (palette));
 
@@ -783,7 +746,7 @@ glade_palette_set_project (GladePalette *palette,
  * Sets the appearance of the palette items.
  */
 void
-glade_palette_set_item_appearance (GladePalette * palette,
+glade_palette_set_item_appearance (GladePalette       *palette,
                                    GladeItemAppearance item_appearance)
 {
   GladePalettePrivate *priv;
@@ -794,9 +757,26 @@ glade_palette_set_item_appearance (GladePalette * palette,
 
   if (priv->item_appearance != item_appearance)
     {
+      GtkToolbarStyle style;
       priv->item_appearance = item_appearance;
 
-      glade_palette_update_appearance (palette);
+      switch (item_appearance)
+        {
+          case GLADE_ITEM_ICON_AND_LABEL:
+            style = GTK_TOOLBAR_BOTH_HORIZ;
+            break;
+          case GLADE_ITEM_ICON_ONLY:
+            style = GTK_TOOLBAR_ICONS;
+            break;
+          case GLADE_ITEM_LABEL_ONLY:
+            style = GTK_TOOLBAR_TEXT;
+            break;
+          default:
+            g_assert_not_reached ();
+            break;
+        }
+
+      gtk_tool_palette_set_style (GTK_TOOL_PALETTE (priv->toolpalette), style);
 
       g_object_notify_by_pspec (G_OBJECT (palette), properties[PROP_ITEM_APPEARANCE]);
     }
@@ -810,8 +790,8 @@ glade_palette_set_item_appearance (GladePalette * palette,
  * Sets whether to use small item icons.
  */
 void
-glade_palette_set_use_small_item_icons (GladePalette * palette,
-                                        gboolean use_small_item_icons)
+glade_palette_set_use_small_item_icons (GladePalette *palette,
+                                        gboolean      use_small_item_icons)
 {
   GladePalettePrivate *priv;
   g_return_if_fail (GLADE_IS_PALETTE (palette));
@@ -821,12 +801,13 @@ glade_palette_set_use_small_item_icons (GladePalette * palette,
     {
       priv->use_small_item_icons = use_small_item_icons;
 
-      glade_palette_update_appearance (palette);
+      gtk_tool_palette_set_icon_size (GTK_TOOL_PALETTE (priv->toolpalette),
+                                      (use_small_item_icons) ?
+                                        GTK_ICON_SIZE_SMALL_TOOLBAR :
+                                        GTK_ICON_SIZE_LARGE_TOOLBAR);
 
       g_object_notify_by_pspec (G_OBJECT (palette), properties[PROP_USE_SMALL_ITEM_ICONS]);
-
     }
-
 }
 
 /**
@@ -837,8 +818,8 @@ glade_palette_set_use_small_item_icons (GladePalette * palette,
  * Sets whether to show the internal widget selector button
  */
 void
-glade_palette_set_show_selector_button (GladePalette * palette,
-                                        gboolean show_selector_button)
+glade_palette_set_show_selector_button (GladePalette *palette,
+                                        gboolean      show_selector_button)
 {
   GladePalettePrivate *priv;
   g_return_if_fail (GLADE_IS_PALETTE (palette));
@@ -864,7 +845,7 @@ glade_palette_set_show_selector_button (GladePalette * palette,
  * Returns: The appearance of the palette items
  */
 GladeItemAppearance
-glade_palette_get_item_appearance (GladePalette * palette)
+glade_palette_get_item_appearance (GladePalette *palette)
 {;
   g_return_val_if_fail (GLADE_IS_PALETTE (palette), GLADE_ITEM_ICON_ONLY);
 
@@ -878,7 +859,7 @@ glade_palette_get_item_appearance (GladePalette * palette)
  * Returns: Whether small item icons are used
  */
 gboolean
-glade_palette_get_use_small_item_icons (GladePalette * palette)
+glade_palette_get_use_small_item_icons (GladePalette *palette)
 {
   g_return_val_if_fail (GLADE_IS_PALETTE (palette), FALSE);
 
@@ -892,7 +873,7 @@ glade_palette_get_use_small_item_icons (GladePalette * palette)
  * Returns: Whether the selector button is visible
  */
 gboolean
-glade_palette_get_show_selector_button (GladePalette * palette)
+glade_palette_get_show_selector_button (GladePalette *palette)
 {
   g_return_val_if_fail (GLADE_IS_PALETTE (palette), FALSE);
 

gladeui/glade-placeholder.c

@@ -73,22 +73,20 @@ enum
   PROP_VSCROLL_POLICY
 };
 
-#define GLADE_PLACEHOLDER_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), \
-                                               GLADE_TYPE_PLACEHOLDER,                \
-                                               GladePlaceholderPrivate))
 #define GLADE_PLACEHOLDER_PRIVATE(object) (((GladePlaceholder*)object)->priv)
 
 static void glade_placeholder_drag_init (_GladeDragInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (GladePlaceholder, glade_placeholder, GTK_TYPE_WIDGET,
+                         G_ADD_PRIVATE (GladePlaceholder)
                          G_IMPLEMENT_INTERFACE (GTK_TYPE_SCROLLABLE, NULL)
                          G_IMPLEMENT_INTERFACE (GLADE_TYPE_DRAG, 
                                                 glade_placeholder_drag_init))
 
 static void
-glade_placeholder_notify_parent (GObject *gobject,
+glade_placeholder_notify_parent (GObject    *gobject,
                                  GParamSpec *arg1,
-                                 gpointer user_data)
+                                 gpointer    user_data)
 {
   GladePlaceholder *placeholder = GLADE_PLACEHOLDER (gobject);
   GladeWidgetAdaptor *parent_adaptor = NULL;
@@ -113,7 +111,7 @@ glade_placeholder_notify_parent (GObject *gobject,
 static void
 glade_placeholder_init (GladePlaceholder *placeholder)
 {
-  placeholder->priv =  GLADE_PLACEHOLDER_GET_PRIVATE (placeholder);
+  placeholder->priv =  glade_placeholder_get_instance_private (placeholder);
 
   placeholder->priv->packing_actions = NULL;
 
@@ -151,10 +149,10 @@ glade_placeholder_finalize (GObject *object)
 }
 
 static void
-glade_placeholder_set_property (GObject *object,
-                                guint prop_id,
+glade_placeholder_set_property (GObject      *object,
+                                guint         prop_id,
                                 const GValue *value,
-                                GParamSpec *pspec)
+                                GParamSpec   *pspec)
 {
 
   switch (prop_id)
@@ -171,9 +169,9 @@ glade_placeholder_set_property (GObject *object,
 }
 
 static void
-glade_placeholder_get_property (GObject *object,
-                                guint prop_id,
-                                GValue *value,
+glade_placeholder_get_property (GObject    *object,
+                                guint       prop_id,
+                                GValue     *value,
                                 GParamSpec *pspec)
 {
   switch (prop_id)
@@ -355,22 +353,30 @@ glade_placeholder_draw (GtkWidget *widget, cairo_t *cr)
   return FALSE;
 }
 
+static void
+glade_placeholder_update_cursor (GladePlaceholder *placeholder, GdkWindow *win)
+{
+  GladeProject *project = glade_placeholder_get_project (placeholder);
+  GladePointerMode pointer_mode = glade_project_get_pointer_mode (project);
+
+  if (pointer_mode == GLADE_POINTER_SELECT)
+    glade_cursor_set (project, win, GLADE_CURSOR_SELECTOR);
+  else if (pointer_mode == GLADE_POINTER_ADD_WIDGET)
+    glade_cursor_set (project, win, GLADE_CURSOR_ADD_WIDGET);
+}
+
+static gboolean
+glade_placeholder_enter_notify_event (GtkWidget        *widget, 
+                                      GdkEventCrossing *event)
+{
+  glade_placeholder_update_cursor (GLADE_PLACEHOLDER (widget), event->window);
+  return FALSE;
+}
+
 static gboolean
 glade_placeholder_motion_notify_event (GtkWidget *widget, GdkEventMotion *event)
 {
-  GladePointerMode pointer_mode;
-  GladeProject *project;
-
-  g_return_val_if_fail (GLADE_IS_PLACEHOLDER (widget), FALSE);
-
-  project      = glade_placeholder_get_project (GLADE_PLACEHOLDER (widget));
-  pointer_mode = glade_project_get_pointer_mode (project);
-
-  if (pointer_mode == GLADE_POINTER_SELECT)
-    glade_cursor_set (project, event->window, GLADE_CURSOR_SELECTOR);
-  else if (pointer_mode == GLADE_POINTER_ADD_WIDGET)
-    glade_cursor_set (project, event->window, GLADE_CURSOR_ADD_WIDGET);
-
+  glade_placeholder_update_cursor (GLADE_PLACEHOLDER (widget), event->window);
   return FALSE;
 }
 
@@ -539,6 +545,7 @@ glade_placeholder_class_init (GladePlaceholderClass *klass)
   widget_class->unmap = glade_placeholder_unmap;
   widget_class->size_allocate = glade_placeholder_size_allocate;
   widget_class->draw = glade_placeholder_draw;
+  widget_class->enter_notify_event = glade_placeholder_enter_notify_event;
   widget_class->motion_notify_event = glade_placeholder_motion_notify_event;
   widget_class->button_press_event = glade_placeholder_button_press;
   widget_class->popup_menu = glade_placeholder_popup_menu;
@@ -565,8 +572,6 @@ glade_placeholder_class_init (GladePlaceholderClass *klass)
       cairo_pattern_set_extend (placeholder_pattern, CAIRO_EXTEND_REPEAT);
     }
   g_free (path);
-
-  g_type_class_add_private (klass, sizeof (GladePlaceholderPrivate));
 }
 
 /**

gladeui/glade-popup.c

@@ -147,7 +147,7 @@ glade_popup_delete_cb (GtkMenuItem *item, GladeWidget *widget)
                   PLACEHOLDER POPUP
  *******************************************************/
 static void
-glade_popup_placeholder_paste_cb (GtkMenuItem *item,
+glade_popup_placeholder_paste_cb (GtkMenuItem      *item, 
                                   GladePlaceholder *placeholder)
 {
   GladeProject *project;
@@ -163,13 +163,13 @@ glade_popup_placeholder_paste_cb (GtkMenuItem *item,
                     POPUP BUILDING
  *******************************************************/
 static GtkWidget *
-glade_popup_append_item (GtkWidget *popup_menu,
+glade_popup_append_item (GtkWidget   *popup_menu,
                          const gchar *stock_id,
                          const gchar *label,
-                         GtkWidget *image,
-                         gboolean sensitive,
-                         gpointer callback,
-                         gpointer data)
+                         GtkWidget   *image,
+                         gboolean     sensitive,
+                         gpointer     callback,
+                         gpointer     data)
 {
   GtkWidget *menu_item;
 
@@ -244,11 +244,11 @@ glade_popup_menuitem_ph_packing_activated (GtkMenuItem *item,
 }
 
 static gint
-glade_popup_action_populate_menu_real (GtkWidget *menu,
+glade_popup_action_populate_menu_real (GtkWidget   *menu,
                                        GladeWidget *gwidget,
-                                       GList *actions,
-                                       GCallback callback,
-                                       gpointer data)
+                                       GList       *actions,
+                                       GCallback    callback,
+                                       gpointer     data)
 {
   GtkWidget *item;
   GList *list;
@@ -309,10 +309,10 @@ glade_popup_action_populate_menu_real (GtkWidget *menu,
  * Returns the number of action appended to the menu.
  */
 gint
-glade_popup_action_populate_menu (GtkWidget *menu,
-                                  GladeWidget *widget,
+glade_popup_action_populate_menu (GtkWidget         *menu,
+                                  GladeWidget       *widget,
                                   GladeWidgetAction *action,
-                                  gboolean packing)
+                                  gboolean           packing)
 {
   gint n;
 
@@ -483,9 +483,9 @@ glade_popup_create_menu (GladeWidget      *widget,
 }
 
 void
-glade_popup_widget_pop (GladeWidget *widget,
+glade_popup_widget_pop (GladeWidget    *widget,
                         GdkEventButton *event,
-                        gboolean packing)
+                        gboolean        packing)
 {
   GtkWidget *popup_menu;
   gint button;
@@ -511,7 +511,7 @@ glade_popup_widget_pop (GladeWidget *widget,
 
 void
 glade_popup_placeholder_pop (GladePlaceholder *placeholder,
-                             GdkEventButton *event)
+                             GdkEventButton   *event)
 {
   GladeWidget *widget;
   GtkWidget *popup_menu;

gladeui/glade-preview-template.c

@@ -44,12 +44,25 @@ template_init (GTypeInstance *instance, gpointer g_class)
   gtk_widget_init_template (GTK_WIDGET (instance));
 }
 
+static void
+template_connect_function (GtkBuilder   *builder,
+                           GObject      *object,
+                           const gchar  *signal_name,
+                           const gchar  *handler_name,
+                           GObject      *connect_object,
+                           GConnectFlags flags,
+                           gpointer      data)
+{
+  /* Ignore signal connections */
+}
+
 /* Need to associate the class with a template */
 static void
 template_class_init (gpointer g_class, gpointer user_data)
 {
   TypeData *data = user_data;
   gtk_widget_class_set_template (g_class, data->template_data);
+  gtk_widget_class_set_connect_func (g_class, template_connect_function, NULL, NULL);
 }
 
 static GQuark type_data_quark = 0;
@@ -203,8 +216,12 @@ text (GMarkupParseContext *context,
       gpointer             user_data,
       GError             **error)
 {
+  gchar *escaped_text = g_markup_escape_text (text, text_len);
   ParseData *state = user_data;
-  g_string_append_len (state->xml, text, text_len);
+
+  g_string_append_len (state->xml, escaped_text, -1);
+
+  g_free (escaped_text);
 }
 
 static void

gladeui/glade-preview-window.c

@@ -41,14 +41,12 @@ struct _GladePreviewWindowPrivate
   gchar *extension;
 };
 
-#define GLADE_PREVIEW_WINDOW_GET_PRIVATE(o)  (G_TYPE_INSTANCE_GET_PRIVATE ((o), GLADE_TYPE_PREVIEW_WINDOW, GladePreviewWindowPrivate))
-
-G_DEFINE_TYPE (GladePreviewWindow, glade_preview_window, GTK_TYPE_WINDOW);
+G_DEFINE_TYPE_WITH_PRIVATE (GladePreviewWindow, glade_preview_window, GTK_TYPE_WINDOW);
 
 static void
 glade_preview_window_init (GladePreviewWindow *window)
 {
-  GladePreviewWindowPrivate *priv = GLADE_PREVIEW_WINDOW_GET_PRIVATE (window);
+  GladePreviewWindowPrivate *priv = glade_preview_window_get_instance_private (window);
   GtkWidget *content_area;
 
   window->priv = priv;
@@ -60,12 +58,15 @@ glade_preview_window_init (GladePreviewWindow *window)
   priv->info = gtk_info_bar_new ();
   priv->message_label = gtk_label_new ("");
   gtk_label_set_line_wrap (GTK_LABEL (priv->message_label), TRUE);
+  gtk_label_set_selectable (GTK_LABEL (priv->message_label), TRUE);
 
   gtk_widget_set_valign (priv->info, GTK_ALIGN_END);
   gtk_widget_set_vexpand (priv->info, FALSE);
   content_area = gtk_info_bar_get_content_area (GTK_INFO_BAR (priv->info));
   gtk_container_add (GTK_CONTAINER (content_area), priv->message_label);
-  
+
+  gtk_info_bar_set_show_close_button (GTK_INFO_BAR (priv->info), TRUE);
+
   g_signal_connect (priv->info, "response", G_CALLBACK (gtk_widget_hide), NULL);
   
   gtk_box_pack_start (GTK_BOX (priv->box), priv->info, FALSE, FALSE, 0);
@@ -78,7 +79,7 @@ glade_preview_window_init (GladePreviewWindow *window)
 static void
 glade_preview_window_finalize (GObject *object)
 {
-  GladePreviewWindowPrivate *priv = GLADE_PREVIEW_WINDOW_GET_PRIVATE (object);
+  GladePreviewWindowPrivate *priv = GLADE_PREVIEW_WINDOW (object)->priv;
 
   g_free (priv->css_file);
   g_clear_object (&priv->css_provider);
@@ -157,8 +158,6 @@ glade_preview_window_class_init (GladePreviewWindowClass *klass)
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (GladePreviewWindowPrivate));
-
   object_class->finalize = glade_preview_window_finalize;
 
   widget_class->realize = glade_preview_window_realize;

gladeui/glade-preview.c

@@ -62,9 +62,7 @@ struct _GladePreviewPrivate
   GPid pid;                     /* Pid of the corresponding glade-previewer process */
 };
 
-G_DEFINE_TYPE (GladePreview, glade_preview, G_TYPE_OBJECT);
-
-#define GLADE_PREVIEW_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GLADE_TYPE_PREVIEW, GladePreviewPrivate))
+G_DEFINE_TYPE_WITH_PRIVATE (GladePreview, glade_preview, G_TYPE_OBJECT);
 
 enum
 {
@@ -162,8 +160,6 @@ glade_preview_class_init (GladePreviewClass *klass)
                     G_SIGNAL_RUN_FIRST,
                     0, NULL, NULL,
                     g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-
-  g_type_class_add_private (klass, sizeof (GladePreviewPrivate));
 }
 
 static void
@@ -171,7 +167,7 @@ glade_preview_init (GladePreview *self)
 {
   GladePreviewPrivate *priv;
 
-  self->priv = priv = GLADE_PREVIEW_GET_PRIVATE (self);
+  self->priv = priv = glade_preview_get_instance_private (self);
   priv->channel = NULL;
 }
 

gladeui/glade-project-properties.ui

@@ -540,6 +540,7 @@ Authors:
                         <property name="can_focus">False</property>
                         <property name="active">0</property>
                         <items>
+                          <item id="other" translatable="yes">Other</item>
                           <item id="gplv2" translatable="yes">GNU GPL version 2</item>
                           <item id="gplv3" translatable="yes">GNU GPL version 3</item>
                           <item id="lgplv2" translatable="yes">GNU LGPL version 2.1</item>
@@ -549,7 +550,6 @@ Authors:
                           <item id="apache2" translatable="yes">Apache 2</item>
                           <item id="mit" translatable="yes">MIT</item>
                           <item id="all_permissive" translatable="yes">GNU All permissive</item>
-                          <item id="other" translatable="yes">Other</item>
                         </items>
                         <signal name="changed" handler="on_license_comboboxtext_changed" swapped="no"/>
                       </object>

gladeui/glade-project.c

@@ -214,6 +214,7 @@ static GladeIDAllocator *unsaved_number_allocator = NULL;
    ((GladeProject*)(project))->priv->stamp == (iter)->stamp)
 
 G_DEFINE_TYPE_WITH_CODE (GladeProject, glade_project, G_TYPE_OBJECT,
+                         G_ADD_PRIVATE (GladeProject)
                          G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_MODEL,
                                                 glade_project_model_iface_init)
                          G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_DRAG_SOURCE,
@@ -363,9 +364,9 @@ glade_project_finalize (GObject *object)
 }
 
 static void
-glade_project_get_property (GObject *object,
-                            guint prop_id,
-                            GValue *value,
+glade_project_get_property (GObject    *object,
+                            guint       prop_id,
+                            GValue     *value,
                             GParamSpec *pspec)
 {
   GladeProject *project = GLADE_PROJECT (object);
@@ -412,10 +413,10 @@ glade_project_get_property (GObject *object,
 }
 
 static void
-glade_project_set_property (GObject *object,
-                            guint prop_id,
+glade_project_set_property (GObject      *object,
+                            guint         prop_id,
                             const GValue *value,
-                            GParamSpec *pspec)
+                            GParamSpec   *pspec)
 {
   switch (prop_id)
     {
@@ -646,7 +647,8 @@ glade_project_destroy_preview (gpointer data)
 
 static void
 glade_project_changed_impl (GladeProject *project,
-                            GladeCommand *command, gboolean forward)
+                            GladeCommand *command,
+                            gboolean      forward)
 {
   if (!project->priv->loading)
     {
@@ -696,9 +698,7 @@ glade_project_init (GladeProject *project)
   GladeProjectPrivate *priv;
   GList *list;
 
-  project->priv = priv =
-      G_TYPE_INSTANCE_GET_PRIVATE ((project), GLADE_TYPE_PROJECT,
-                                   GladeProjectPrivate);
+  project->priv = priv = glade_project_get_instance_private (project);
 
   priv->path = NULL;
   priv->model = GTK_TREE_MODEL (gtk_tree_store_new (1, G_TYPE_OBJECT));
@@ -1033,8 +1033,6 @@ glade_project_class_init (GladeProjectClass *klass)
 
   /* Install all properties */
   g_object_class_install_properties (object_class, N_PROPERTIES, glade_project_props);
-
-  g_type_class_add_private (klass, sizeof (GladeProjectPrivate));
 }
 
 /******************************************************************
@@ -1077,8 +1075,8 @@ glade_project_model_get_column_type (GtkTreeModel *model, gint column)
 
 static gboolean
 glade_project_model_get_iter (GtkTreeModel *model,
-                              GtkTreeIter *iter,
-                              GtkTreePath *path)
+                              GtkTreeIter  *iter,
+                              GtkTreePath  *path)
 {
   return gtk_tree_model_get_iter (GLADE_PROJECT (model)->priv->model, iter, path);
 }
@@ -1091,9 +1089,9 @@ glade_project_model_get_path (GtkTreeModel *model, GtkTreeIter *iter)
 
 static void
 glade_project_model_get_value (GtkTreeModel *model,
-                               GtkTreeIter *iter,
-                               gint column,
-                               GValue *value)
+                               GtkTreeIter  *iter,
+                               gint          column,
+                               GValue       *value)
 {
   GladeWidget *widget;
 
@@ -1178,9 +1176,9 @@ glade_project_model_iter_n_children (GtkTreeModel *model, GtkTreeIter *iter)
 
 static gboolean
 glade_project_model_iter_nth_child (GtkTreeModel *model,
-                                    GtkTreeIter *iter,
-                                    GtkTreeIter *parent,
-                                    gint nth)
+                                    GtkTreeIter  *iter,
+                                    GtkTreeIter  *parent,
+                                    gint          nth)
 {
   return gtk_tree_model_iter_nth_child (GLADE_PROJECT (model)->priv->model,
                                         iter, parent, nth);
@@ -1188,8 +1186,8 @@ glade_project_model_iter_nth_child (GtkTreeModel *model,
 
 static gboolean
 glade_project_model_iter_children (GtkTreeModel *model,
-                                   GtkTreeIter *iter,
-                                   GtkTreeIter *parent)
+                                   GtkTreeIter  *iter,
+                                   GtkTreeIter  *parent)
 {
   return gtk_tree_model_iter_children (GLADE_PROJECT (model)->priv->model,
                                        iter, parent);
@@ -1197,8 +1195,8 @@ glade_project_model_iter_children (GtkTreeModel *model,
 
 static gboolean
 glade_project_model_iter_parent (GtkTreeModel *model,
-                                 GtkTreeIter *iter,
-                                 GtkTreeIter *child)
+                                 GtkTreeIter  *iter,
+                                 GtkTreeIter  *child)
 {
   return gtk_tree_model_iter_parent (GLADE_PROJECT (model)->priv->model,
                                      iter, child);
@@ -1402,7 +1400,8 @@ gp_comment_get_content (GladeXmlNode *comment)
 
 static gchar *
 glade_project_read_requires_from_comment (GladeXmlNode *comment,
-                                          guint16 *major, guint16 *minor)
+                                          guint16      *major,
+                                          guint16      *minor)
 {
   gchar *value, *requires, *required_lib = NULL;
   
@@ -1430,7 +1429,8 @@ glade_project_read_requires_from_comment (GladeXmlNode *comment,
 static gboolean
 glade_project_read_requires (GladeProject *project,
                              GladeXmlNode *root_node,
-                             const gchar *path, gboolean *has_gtk_dep)
+                             const gchar  *path,
+                             gboolean     *has_gtk_dep)
 {
 
   GString *string = g_string_new (NULL);
@@ -1706,7 +1706,7 @@ typedef struct
 } VersionData;
 
 static void
-glade_project_introspect_signal_versions (GladeSignal *signal,
+glade_project_introspect_signal_versions (GladeSignal *signal, 
                                           VersionData *data)
 {
   GladeSignalClass   *signal_class;
@@ -1817,7 +1817,7 @@ glade_project_introspect_gtk_version (GladeProject *project)
         target_minor = data.minor;
     }
 
-  glade_project_set_target_version (project, "gtk+", target_major,
+  glade_project_set_target_version (project, "gtk+", target_major, 
                                     target_minor);
 }
 
@@ -1825,7 +1825,7 @@ glade_project_introspect_gtk_version (GladeProject *project)
 static gint
 glade_project_count_xml_objects (GladeProject *project,
                                  GladeXmlNode *root,
-                                 gint count)
+                                 gint          count)
 {
   GladeXmlNode *node;
 
@@ -2228,9 +2228,9 @@ glade_project_write_comment_property (GladeProject    *project,
 }
 
 static void
-glade_project_write_required_libs (GladeProject *project,
+glade_project_write_required_libs (GladeProject    *project,
                                    GladeXmlContext *context,
-                                   GladeXmlNode *root)
+                                   GladeXmlNode    *root)
 {
   gboolean supports_require_tag;
   GladeXmlNode *req_node;
@@ -2278,9 +2278,9 @@ glade_project_write_required_libs (GladeProject *project,
 }
 
 static void
-glade_project_write_resource_path (GladeProject *project,
+glade_project_write_resource_path (GladeProject    *project,
                                    GladeXmlContext *context,
-                                   GladeXmlNode *root)
+                                   GladeXmlNode    *root)
 {
   glade_project_write_comment_property (project, context, root,
                                         "interface-local-resource-path",
@@ -2288,9 +2288,9 @@ glade_project_write_resource_path (GladeProject *project,
 }
 
 static void
-glade_project_write_css_provider_path (GladeProject *project,
+glade_project_write_css_provider_path (GladeProject    *project,
                                        GladeXmlContext *context,
-                                       GladeXmlNode *root)
+                                       GladeXmlNode    *root)
 {
   GladeProjectPrivate *priv = project->priv;
   gchar *dirname;
@@ -2319,9 +2319,9 @@ glade_project_write_css_provider_path (GladeProject *project,
 }
 
 static void
-glade_project_write_license_data (GladeProject *project,
+glade_project_write_license_data (GladeProject    *project,
                                   GladeXmlContext *context,
-                                  GladeXmlNode *root)
+                                  GladeXmlNode    *root)
 {
   gchar *license, *name, *description, *copyright, *authors;
   
@@ -2413,7 +2413,13 @@ glade_project_get_graph_deps (GladeProject *project)
       for (ll = _glade_widget_peek_prop_refs (predecessor); ll; ll = g_list_next (ll))
         {
           GladeWidget *successor = glade_property_get_widget (ll->data);
-          GladeWidget *successor_top = glade_widget_get_toplevel (successor);
+          GladeWidget *successor_top;
+
+          /* Ignore widgets that are not part of this project. (ie removed ones) */
+          if (glade_widget_get_project (successor) != project)
+            continue;
+
+          successor_top = glade_widget_get_toplevel (successor);
 
           /* Ignore objects within the same toplevel */
           if (predecessor_top != successor_top)
@@ -2660,9 +2666,7 @@ glade_project_write (GladeProject *project)
  * Returns: %TRUE on success, %FALSE on failure
  */
 gboolean
-glade_project_backup (GladeProject        *project,
-		      const gchar         *path, 
-		      GError             **error)
+glade_project_backup (GladeProject *project, const gchar *path, GError **error)
 {
   gchar *canonical_path;
   gchar *destination_path;
@@ -2691,7 +2695,6 @@ glade_project_backup (GladeProject        *project,
 /**
  * glade_project_autosave:
  * @project: a #GladeProject
- * @path: location to save glade file
  * @error: an error from the G_FILE_ERROR domain.
  * 
  * Saves an autosave snapshot of @project to it's currently set path
@@ -2701,8 +2704,7 @@ glade_project_backup (GladeProject        *project,
  * Returns: %TRUE on success, %FALSE on failure
  */
 gboolean
-glade_project_autosave (GladeProject        *project,
-			GError             **error)
+glade_project_autosave (GladeProject *project, GError **error)
 {
 
   GladeXmlContext *context;
@@ -2739,10 +2741,10 @@ glade_project_autosave (GladeProject        *project,
  * Returns: %TRUE on success, %FALSE on failure
  */
 gboolean
-glade_project_save_verify (GladeProject        *project,
-			   const gchar         *path,
-			   GladeVerifyFlags     flags,
-			   GError             **error)
+glade_project_save_verify (GladeProject      *project,
+			   const gchar       *path,
+			   GladeVerifyFlags   flags,
+			   GError           **error)
 {
   GladeXmlContext *context;
   GladeXmlDoc *doc;
@@ -2942,11 +2944,11 @@ glade_project_preview (GladeProject *project, GladeWidget *gwidget)
 
 
 static void
-glade_project_verify_property_internal (GladeProject *project,
-                                        GladeProperty *property,
-                                        const gchar *path_name,
-                                        GString *string,
-                                        gboolean forwidget,
+glade_project_verify_property_internal (GladeProject    *project,
+                                        GladeProperty   *property,
+                                        const gchar     *path_name,
+                                        GString         *string,
+                                        gboolean         forwidget,
 					GladeVerifyFlags flags)
 {
   GladeWidgetAdaptor *adaptor, *prop_adaptor;
@@ -3026,10 +3028,10 @@ glade_project_verify_property_internal (GladeProject *project,
 }
 
 static void
-glade_project_verify_properties_internal (GladeWidget *widget,
-                                          const gchar *path_name,
-                                          GString *string,
-                                          gboolean forwidget,
+glade_project_verify_properties_internal (GladeWidget     *widget,
+                                          const gchar     *path_name,
+                                          GString         *string,
+                                          gboolean         forwidget,
 					  GladeVerifyFlags flags)
 {
   GList *list;
@@ -3056,11 +3058,11 @@ glade_project_verify_properties_internal (GladeWidget *widget,
 }
 
 static void
-glade_project_verify_signal_internal (GladeWidget *widget,
-                                      GladeSignal *signal,
-                                      const gchar *path_name,
-                                      GString *string,
-                                      gboolean forwidget,
+glade_project_verify_signal_internal (GladeWidget     *widget,
+                                      GladeSignal     *signal,
+                                      const gchar     *path_name,
+                                      GString         *string,
+                                      gboolean         forwidget,
 				      GladeVerifyFlags flags)
 {
   GladeSignalClass   *signal_class;
@@ -3166,10 +3168,10 @@ glade_project_verify_signal (GladeWidget *widget, GladeSignal *signal)
 }
 
 static void
-glade_project_verify_signals (GladeWidget *widget,
-                              const gchar *path_name,
-                              GString *string,
-                              gboolean forwidget,
+glade_project_verify_signals (GladeWidget     *widget,
+                              const gchar     *path_name,
+                              GString         *string,
+                              gboolean         forwidget,
 			      GladeVerifyFlags flags)
 {
   GladeSignal *signal;
@@ -3221,8 +3223,8 @@ glade_project_verify_properties (GladeWidget *widget)
 
 static gboolean
 glade_project_verify_dialog (GladeProject *project,
-                             GString *string,
-			     gboolean saving)
+                             GString      *string,
+			     gboolean      saving)
 {
   GtkWidget *swindow;
   GtkWidget *textview;
@@ -3259,7 +3261,9 @@ glade_project_verify_dialog (GladeProject *project,
 
 
 gboolean
-glade_project_verify (GladeProject *project, gboolean saving, GladeVerifyFlags flags)
+glade_project_verify (GladeProject    *project,
+                      gboolean         saving,
+                      GladeVerifyFlags flags)
 {
   GString *string = g_string_new (NULL);
   GList *list;
@@ -3310,10 +3314,10 @@ glade_project_verify (GladeProject *project, gboolean saving, GladeVerifyFlags f
 }
 
 static void
-glade_project_target_version_for_adaptor (GladeProject *project,
+glade_project_target_version_for_adaptor (GladeProject       *project,
                                           GladeWidgetAdaptor *adaptor,
-                                          gint *major,
-                                          gint *minor)
+                                          gint               *major,
+                                          gint               *minor)
 {
   gchar *catalog = NULL;
 
@@ -3323,13 +3327,13 @@ glade_project_target_version_for_adaptor (GladeProject *project,
 }
 
 static void
-glade_project_verify_adaptor (GladeProject *project,
+glade_project_verify_adaptor (GladeProject       *project,
                               GladeWidgetAdaptor *adaptor,
-                              const gchar *path_name,
-                              GString *string,
-                              GladeVerifyFlags flags,
-                              gboolean forwidget,
-                              GladeSupportMask *mask)
+                              const gchar        *path_name,
+                              GString            *string,
+                              GladeVerifyFlags   flags,
+                              gboolean           forwidget,
+                              GladeSupportMask   *mask)
 {
   GladeSupportMask support_mask = GLADE_SUPPORT_OK;
   GladeWidgetAdaptor *adaptor_iter;
@@ -3412,9 +3416,9 @@ glade_project_verify_adaptor (GladeProject *project,
  * Returns: A newly allocated string 
  */
 gchar *
-glade_project_verify_widget_adaptor (GladeProject *project,
+glade_project_verify_widget_adaptor (GladeProject       *project,
                                      GladeWidgetAdaptor *adaptor,
-                                     GladeSupportMask *mask)
+                                     GladeSupportMask   *mask)
 {
   GString *string = g_string_new (NULL);
   gchar *ret = NULL;
@@ -3468,7 +3472,6 @@ glade_project_verify_project_for_ui (GladeProject *project)
 /**
  * glade_project_get_widget_by_name:
  * @project: a #GladeProject
- * @ancestor: The toplevel project object to search under
  * @name: The user visible name of the widget we are looking for
  * 
  * Searches under @ancestor in @project looking for a #GladeWidget named @name.
@@ -3476,8 +3479,7 @@ glade_project_verify_project_for_ui (GladeProject *project)
  * Returns: a pointer to the widget, %NULL if the widget does not exist
  */
 GladeWidget *
-glade_project_get_widget_by_name (GladeProject *project,
-                                  const gchar  *name)
+glade_project_get_widget_by_name (GladeProject *project, const gchar *name)
 {
   GList *list;
 
@@ -3499,8 +3501,8 @@ glade_project_get_widget_by_name (GladeProject *project,
 
 static void
 glade_project_release_widget_name (GladeProject *project,
-                                   GladeWidget *gwidget,
-                                   const char *widget_name)
+                                   GladeWidget  *gwidget,
+                                   const char   *widget_name)
 {
   glade_name_context_release_name (project->priv->widget_names, widget_name);
 }
@@ -3517,8 +3519,8 @@ glade_project_release_widget_name (GladeProject *project,
  */
 gboolean
 glade_project_available_widget_name (GladeProject *project,
-                                     GladeWidget *widget,
-                                     const gchar *name)
+                                     GladeWidget  *widget,
+                                     const gchar  *name)
 {
   g_return_val_if_fail (GLADE_IS_PROJECT (project), FALSE);
   g_return_val_if_fail (GLADE_IS_WIDGET (widget), FALSE);
@@ -3531,8 +3533,8 @@ glade_project_available_widget_name (GladeProject *project,
 
 static void
 glade_project_reserve_widget_name (GladeProject *project,
-                                   GladeWidget *gwidget,
-                                   const char *widget_name)
+                                   GladeWidget  *gwidget,
+                                   const char   *widget_name)
 {
   if (!glade_project_available_widget_name (project, gwidget, widget_name))
     {
@@ -3559,8 +3561,8 @@ glade_project_reserve_widget_name (GladeProject *project,
  */
 gchar *
 glade_project_new_widget_name (GladeProject *project,
-                               GladeWidget *widget,
-                               const gchar *base_name)
+                               GladeWidget  *widget,
+                               const gchar  *base_name)
 {
   gchar *name;
 
@@ -3645,8 +3647,8 @@ glade_project_get_iter_for_object (GladeProject *project,
  */
 void
 glade_project_set_widget_name (GladeProject *project,
-                               GladeWidget *widget,
-                               const gchar *name)
+                               GladeWidget  *widget,
+                               const gchar  *name)
 {
   gchar *new_name;
 
@@ -4026,8 +4028,7 @@ glade_project_get_pointer_mode (GladeProject *project)
 }
 
 void
-glade_project_set_template (GladeProject       *project,
-			    GladeWidget        *widget)
+glade_project_set_template (GladeProject *project, GladeWidget *widget)
 {
   g_return_if_fail (GLADE_IS_PROJECT (project));
   g_return_if_fail (widget == NULL || GLADE_IS_WIDGET (widget));
@@ -4057,7 +4058,7 @@ glade_project_set_template (GladeProject       *project,
 }
 
 GladeWidget *
-glade_project_get_template (GladeProject       *project)
+glade_project_get_template (GladeProject *project)
 {
   g_return_val_if_fail (GLADE_IS_PROJECT (project), FALSE);
 
@@ -4091,9 +4092,9 @@ glade_project_get_add_item (GladeProject *project)
 
 void
 glade_project_set_target_version (GladeProject *project,
-                                  const gchar *catalog,
-                                  gint major,
-                                  gint minor)
+                                  const gchar  *catalog,
+                                  gint          major,
+                                  gint          minor)
 {
   g_return_if_fail (GLADE_IS_PROJECT (project));
   g_return_if_fail (catalog && catalog[0]);
@@ -4134,9 +4135,9 @@ glade_project_set_readonly (GladeProject *project, gboolean readonly)
  */
 void
 glade_project_get_target_version (GladeProject *project,
-                                  const gchar *catalog,
-                                  gint *major,
-                                  gint *minor)
+                                  const gchar  *catalog,
+                                  gint         *major,
+                                  gint         *minor)
 {
   g_return_if_fail (GLADE_IS_PROJECT (project));
   g_return_if_fail (catalog && catalog[0]);
@@ -4288,8 +4289,8 @@ glade_project_selection_clear (GladeProject *project, gboolean emit_signal)
  */
 void
 glade_project_selection_remove (GladeProject *project,
-                                GObject *object,
-                                gboolean emit_signal)
+                                GObject      *object,
+                                gboolean      emit_signal)
 {
   g_return_if_fail (GLADE_IS_PROJECT (project));
   g_return_if_fail (G_IS_OBJECT (object));
@@ -4318,8 +4319,8 @@ glade_project_selection_remove (GladeProject *project,
  */
 void
 glade_project_selection_add (GladeProject *project,
-                             GObject *object,
-                             gboolean emit_signal)
+                             GObject      *object,
+                             gboolean      emit_signal)
 {
   g_return_if_fail (GLADE_IS_PROJECT (project));
   g_return_if_fail (G_IS_OBJECT (object));
@@ -4356,8 +4357,8 @@ glade_project_selection_add (GladeProject *project,
  */
 void
 glade_project_selection_set (GladeProject *project,
-                             GObject *object,
-                             gboolean emit_signal)
+                             GObject      *object,
+                             gboolean      emit_signal)
 {
   g_return_if_fail (GLADE_IS_PROJECT (project));
   g_return_if_fail (G_IS_OBJECT (object));
@@ -5009,7 +5010,7 @@ glade_project_get_css_provider_path (GladeProject *project)
  *                Command Central                *
  *************************************************/
 static gboolean
-widget_contains_unknown_type (GladeWidget * widget)
+widget_contains_unknown_type (GladeWidget *widget)
 {
   GList *list, *l;
   GObject *object;
@@ -5104,7 +5105,7 @@ glade_project_command_cut (GladeProject *project)
 }
 
 void
-glade_project_command_paste (GladeProject *project,
+glade_project_command_paste (GladeProject     *project,
                              GladePlaceholder *placeholder)
 {
   GladeClipboard *clipboard;

gladeui/glade-property-label.c

@@ -290,12 +290,12 @@ glade_property_label_load (GladeEditable   *editable,
 }
 
 static void
-glade_property_label_set_show_name (GladeEditable * editable, gboolean show_name)
+glade_property_label_set_show_name (GladeEditable *editable, gboolean show_name)
 {
 }
 
 static void
-glade_property_label_editable_init (GladeEditableIface * iface)
+glade_property_label_editable_init (GladeEditableIface *iface)
 {
   parent_editable_iface = g_type_default_interface_peek (GLADE_TYPE_EDITABLE);
 
@@ -609,8 +609,8 @@ glade_property_label_get_custom_tooltip (GladePropertyLabel *label)
 }
 
 void
-glade_property_label_set_property (GladePropertyLabel    *label,
-				   GladeProperty         *property)
+glade_property_label_set_property (GladePropertyLabel *label,
+				   GladeProperty      *property)
 {
   GladePropertyLabelPrivate *priv;
 

gladeui/glade-property-shell.c

@@ -33,15 +33,15 @@
 #include "glade-marshallers.h"
 
 /* GObjectClass */
-static void      glade_property_shell_finalize          (GObject         *object);
-static void      glade_property_shell_set_real_property (GObject         *object,
-							 guint            prop_id,
-							 const GValue    *value,
-							 GParamSpec      *pspec);
-static void      glade_property_shell_get_real_property (GObject         *object,
-							 guint            prop_id,
-							 GValue          *value,
-							 GParamSpec      *pspec);
+static void      glade_property_shell_finalize          (GObject       *object);
+static void      glade_property_shell_set_real_property (GObject       *object,
+							 guint          prop_id,
+							 const GValue  *value,
+							 GParamSpec    *pspec);
+static void      glade_property_shell_get_real_property (GObject       *object,
+							 guint          prop_id,
+							 GValue        *value,
+							 GParamSpec    *pspec);
 
 /* GladeEditableIface */
 static void      glade_property_shell_editable_init     (GladeEditableIface *iface);
@@ -83,25 +83,23 @@ static guint glade_property_shell_signals[LAST_SIGNAL] = { 0, };
 static GladeEditableIface *parent_editable_iface;
 
 G_DEFINE_TYPE_WITH_CODE (GladePropertyShell, glade_property_shell, GTK_TYPE_BOX,
+                         G_ADD_PRIVATE (GladePropertyShell)
 			 G_IMPLEMENT_INTERFACE (GLADE_TYPE_EDITABLE,
                                                 glade_property_shell_editable_init));
 
 static void
 glade_property_shell_init (GladePropertyShell *shell)
 {
-  shell->priv = 
-    G_TYPE_INSTANCE_GET_PRIVATE (shell,
-				 GLADE_TYPE_PROPERTY_SHELL,
-				 GladePropertyShellPrivate);
+  shell->priv = glade_property_shell_get_instance_private (shell);
 
   shell->priv->packing = FALSE;
   shell->priv->use_command = TRUE;
 }
 
 static void
-glade_property_shell_class_init (GladePropertyShellClass *class)
+glade_property_shell_class_init (GladePropertyShellClass *klass)
 {
-  GObjectClass *gobject_class = G_OBJECT_CLASS (class);
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
   
   gobject_class->finalize = glade_property_shell_finalize;
   gobject_class->set_property = glade_property_shell_set_real_property;
@@ -168,8 +166,6 @@ glade_property_shell_class_init (GladePropertyShellClass *class)
                     0, NULL, NULL,
                     _glade_marshal_VOID__POINTER,
                     G_TYPE_NONE, 1, G_TYPE_POINTER);
-
-  g_type_class_add_private (gobject_class, sizeof (GladePropertyShellPrivate));
 }
 
 
@@ -188,10 +184,10 @@ glade_property_shell_finalize (GObject *object)
 }
 
 static void
-glade_property_shell_set_real_property (GObject         *object,
-					guint            prop_id,
-					const GValue    *value,
-					GParamSpec      *pspec)
+glade_property_shell_set_real_property (GObject      *object,
+					guint         prop_id,
+					const GValue *value,
+					GParamSpec   *pspec)
 {
   GladePropertyShell *shell = GLADE_PROPERTY_SHELL (object);
   GladePropertyShellPrivate *priv = shell->priv;
@@ -231,10 +227,10 @@ glade_property_shell_set_real_property (GObject         *object,
 }
 
 static void
-glade_property_shell_get_real_property (GObject         *object,
-					guint            prop_id,
-					GValue          *value,
-					GParamSpec      *pspec)
+glade_property_shell_get_real_property (GObject    *object,
+					guint       prop_id,
+					GValue     *value,
+					GParamSpec *pspec)
 {
   GladePropertyShell *shell = GLADE_PROPERTY_SHELL (object);
 
@@ -312,8 +308,8 @@ glade_property_shell_set_eprop (GladePropertyShell  *shell,
 }
 
 static void
-glade_property_shell_load (GladeEditable   *editable,
-			   GladeWidget     *widget)
+glade_property_shell_load (GladeEditable *editable,
+			   GladeWidget   *widget)
 {
   GladePropertyShell *shell = GLADE_PROPERTY_SHELL (editable);
   GladePropertyShellPrivate *priv;
@@ -395,12 +391,12 @@ glade_property_shell_load (GladeEditable   *editable,
 }
 
 static void
-glade_property_shell_set_show_name (GladeEditable * editable, gboolean show_name)
+glade_property_shell_set_show_name (GladeEditable *editable, gboolean show_name)
 {
 }
 
 static void
-glade_property_shell_editable_init (GladeEditableIface * iface)
+glade_property_shell_editable_init (GladeEditableIface *iface)
 {
   parent_editable_iface = g_type_default_interface_peek (GLADE_TYPE_EDITABLE);
 

gladeui/glade-property.c

@@ -136,13 +136,13 @@ enum
 static GParamSpec *properties[N_PROPERTIES];
 static guint glade_property_signals[LAST_SIGNAL] = { 0 };
 
-static GObjectClass *parent_class = NULL;
+static GObjectClass *glade_property_parent_class = NULL;
 
 /*******************************************************************************
                            GladeProperty class methods
  *******************************************************************************/
 static GladeProperty *
-glade_property_dup_impl (GladeProperty * template_prop, GladeWidget * widget)
+glade_property_dup_impl (GladeProperty *template_prop, GladeWidget *widget)
 {
   GladeProperty *property;
 
@@ -178,8 +178,8 @@ glade_property_dup_impl (GladeProperty * template_prop, GladeWidget * widget)
 }
 
 static gboolean
-glade_property_equals_value_impl (GladeProperty * property,
-                                  const GValue * value)
+glade_property_equals_value_impl (GladeProperty *property,
+                                  const GValue  *value)
 {
   return !glade_property_class_compare (property->priv->klass, property->priv->value,
                                         value);
@@ -187,9 +187,9 @@ glade_property_equals_value_impl (GladeProperty * property,
 
 
 static void
-glade_property_update_prop_refs (GladeProperty * property,
-                                 const GValue * old_value,
-                                 const GValue * new_value)
+glade_property_update_prop_refs (GladeProperty *property,
+                                 const GValue  *old_value,
+                                 const GValue  *new_value)
 {
   GladeWidget *gold, *gnew;
   GObject *old_object, *new_object;
@@ -247,7 +247,7 @@ glade_property_update_prop_refs (GladeProperty * property,
 }
 
 static gboolean
-glade_property_verify (GladeProperty * property, const GValue * value)
+glade_property_verify (GladeProperty *property, const GValue *value)
 {
   gboolean ret = FALSE;
   GladeWidget *parent;
@@ -270,7 +270,7 @@ glade_property_verify (GladeProperty * property, const GValue * value)
 }
 
 static void
-glade_property_fix_state (GladeProperty * property)
+glade_property_fix_state (GladeProperty *property)
 {
   property->priv->state = GLADE_STATE_NORMAL;
 
@@ -297,7 +297,7 @@ glade_property_fix_state (GladeProperty * property)
 
 
 static gboolean
-glade_property_set_value_impl (GladeProperty * property, const GValue * value)
+glade_property_set_value_impl (GladeProperty *property, const GValue *value)
 {
   GladeProject *project = property->priv->widget ?
       glade_widget_get_project (property->priv->widget) : NULL;
@@ -406,7 +406,7 @@ glade_property_set_value_impl (GladeProperty * property, const GValue * value)
 }
 
 static void
-glade_property_get_value_impl (GladeProperty * property, GValue * value)
+glade_property_get_value_impl (GladeProperty *property, GValue *value)
 {
   GParamSpec *pspec;
 
@@ -417,70 +417,71 @@ glade_property_get_value_impl (GladeProperty * property, GValue * value)
 }
 
 static void
-glade_property_sync_impl (GladeProperty * property)
+glade_property_sync_impl (GladeProperty *property)
 {
+  GladePropertyPrivate *priv = property->priv;
+  GladePropertyClass *klass = priv->klass;
+  const GValue *value;
+  const gchar *id;
+
   /* Heh, here are the many reasons not to
    * sync a property ;-)
    */
   if (/* the class can be NULL during object,
        * construction this is just a temporary state */
-       property->priv->klass == NULL ||
-       /* optional properties that are disabled */
-       property->priv->enabled == FALSE ||
+       klass == NULL ||
        /* explicit "never sync" flag */
-       glade_property_class_get_ignore (property->priv->klass) ||
+       glade_property_class_get_ignore (klass) ||
        /* recursion guards */
-       property->priv->syncing >= property->priv->sync_tolerance ||
+       priv->syncing >= priv->sync_tolerance ||
        /* No widget owns this property yet */
-       property->priv->widget == NULL)
+       priv->widget == NULL)
     return;
 
+  id = glade_property_class_id (klass);
+
   /* Only the properties from widget->properties should affect the runtime widget.
    * (other properties may be used for convenience in the plugin).
    */
-  if ((glade_property_class_get_is_packing (property->priv->klass) &&
-       !glade_widget_get_pack_property (property->priv->widget, 
-					glade_property_class_id (property->priv->klass)))
-      || !glade_widget_get_property (property->priv->widget, 
-				     glade_property_class_id (property->priv->klass)))
+  if ((glade_property_class_get_is_packing (klass) &&
+       !glade_widget_get_pack_property (priv->widget, id))
+      || !glade_widget_get_property (priv->widget, id))
     return;
 
-  property->priv->syncing++;
+  priv->syncing++;
+
+  /* optional properties that are disabled get the default runtime value */
+  value = (priv->enabled) ? priv->value : glade_property_class_get_default (klass);
 
   /* In the case of construct_only, the widget instance must be rebuilt
    * to apply the property
    */
-  if (glade_property_class_get_construct_only (property->priv->klass) && 
-      property->priv->syncing == 1)
+  if (glade_property_class_get_construct_only (klass) && priv->syncing == 1)
     {
       /* Virtual properties can be construct only, in which
        * case they are allowed to trigger a rebuild, and in
        * the process are allowed to get "synced" after the
        * instance is rebuilt.
        */
-      if (glade_property_class_get_virtual (property->priv->klass))
-        property->priv->sync_tolerance++;
+      if (glade_property_class_get_virtual (klass))
+        priv->sync_tolerance++;
 
-      glade_widget_rebuild (property->priv->widget);
+      glade_widget_rebuild (priv->widget);
 
-      if (glade_property_class_get_virtual (property->priv->klass))
-        property->priv->sync_tolerance--;
+      if (glade_property_class_get_virtual (klass))
+        priv->sync_tolerance--;
     }
-  else if (glade_property_class_get_is_packing (property->priv->klass))
-    glade_widget_child_set_property (glade_widget_get_parent (property->priv->widget),
-                                     property->priv->widget,
-                                     glade_property_class_id (property->priv->klass), 
-				     property->priv->value);
+  else if (glade_property_class_get_is_packing (klass))
+    glade_widget_child_set_property (glade_widget_get_parent (priv->widget),
+                                     priv->widget, id, value);
   else
-    glade_widget_object_set_property (property->priv->widget,
-                                      glade_property_class_id (property->priv->klass), 
-				      property->priv->value);
+    glade_widget_object_set_property (priv->widget, id, value);
 
-  property->priv->syncing--;
+  priv->syncing--;
 }
 
 static void
-glade_property_load_impl (GladeProperty * property)
+glade_property_load_impl (GladeProperty *property)
 {
   GObject *object;
   GObjectClass *oclass;
@@ -508,9 +509,10 @@ glade_property_load_impl (GladeProperty * property)
                       GObjectClass & Object Construction
  *******************************************************************************/
 static void
-glade_property_set_real_property (GObject * object,
-                                  guint prop_id,
-                                  const GValue * value, GParamSpec * pspec)
+glade_property_set_real_property (GObject      *object,
+                                  guint         prop_id,
+                                  const GValue *value,
+                                  GParamSpec   *pspec)
 {
   GladeProperty *property = GLADE_PROPERTY (object);
 
@@ -542,9 +544,10 @@ glade_property_set_real_property (GObject * object,
 }
 
 static void
-glade_property_get_real_property (GObject * object,
-                                  guint prop_id,
-                                  GValue * value, GParamSpec * pspec)
+glade_property_get_real_property (GObject    *object,
+                                  guint       prop_id,
+                                  GValue     *value,
+                                  GParamSpec *pspec)
 {
   GladeProperty *property = GLADE_PROPERTY (object);
 
@@ -579,7 +582,7 @@ glade_property_get_real_property (GObject * object,
 }
 
 static void
-glade_property_finalize (GObject * object)
+glade_property_finalize (GObject *object)
 {
   GladeProperty *property = GLADE_PROPERTY (object);
 
@@ -597,11 +600,11 @@ glade_property_finalize (GObject * object)
   if (property->priv->insensitive_tooltip)
     g_free (property->priv->insensitive_tooltip);
 
-  G_OBJECT_CLASS (parent_class)->finalize (object);
+  G_OBJECT_CLASS (glade_property_parent_class)->finalize (object);
 }
 
 static void
-glade_property_init (GladeProperty * property)
+glade_property_init (GladeProperty *property)
 {
   property->priv = G_TYPE_INSTANCE_GET_PRIVATE (property,
 						GLADE_TYPE_PROPERTY,
@@ -620,7 +623,7 @@ glade_property_klass_init (GladePropertyKlass * prop_class)
   GObjectClass *object_class;
   g_return_if_fail (prop_class != NULL);
 
-  parent_class = g_type_class_peek_parent (prop_class);
+  glade_property_parent_class = g_type_class_peek_parent (prop_class);
   object_class = G_OBJECT_CLASS (prop_class);
 
   /* GObjectClass */
@@ -757,8 +760,9 @@ glade_property_get_type (void)
  * Returns: The newly created #GladeProperty
  */
 GladeProperty *
-glade_property_new (GladePropertyClass * klass,
-                    GladeWidget * widget, GValue * value)
+glade_property_new (GladePropertyClass *klass,
+                    GladeWidget        *widget,
+                    GValue             *value)
 {
   GladeProperty *property;
 
@@ -793,14 +797,14 @@ glade_property_new (GladePropertyClass * klass,
  * Returns: A newly duplicated property based on the new widget
  */
 GladeProperty *
-glade_property_dup (GladeProperty * template_prop, GladeWidget * widget)
+glade_property_dup (GladeProperty *template_prop, GladeWidget *widget)
 {
   g_return_val_if_fail (GLADE_IS_PROPERTY (template_prop), NULL);
   return GLADE_PROPERTY_GET_KLASS (template_prop)->dup (template_prop, widget);
 }
 
 static void
-glade_property_reset_common (GladeProperty * property, gboolean original)
+glade_property_reset_common (GladeProperty *property, gboolean original)
 {
   const GValue *value;
 
@@ -821,7 +825,7 @@ glade_property_reset_common (GladeProperty * property, gboolean original)
  * Resets this property to its default value
  */
 void
-glade_property_reset (GladeProperty * property)
+glade_property_reset (GladeProperty *property)
 {
   glade_property_reset_common (property, FALSE);
 }
@@ -833,13 +837,13 @@ glade_property_reset (GladeProperty * property)
  * Resets this property to its original default value
  */
 void
-glade_property_original_reset (GladeProperty * property)
+glade_property_original_reset (GladeProperty *property)
 {
   glade_property_reset_common (property, TRUE);
 }
 
 static gboolean
-glade_property_default_common (GladeProperty * property, gboolean orig)
+glade_property_default_common (GladeProperty *property, gboolean orig)
 {
   const GValue *value;
 
@@ -860,7 +864,7 @@ glade_property_default_common (GladeProperty * property, gboolean orig)
  * Returns: Whether this property is at its default value
  */
 gboolean
-glade_property_default (GladeProperty * property)
+glade_property_default (GladeProperty *property)
 {
   return glade_property_default_common (property, FALSE);
 }
@@ -872,7 +876,7 @@ glade_property_default (GladeProperty * property)
  * Returns: Whether this property is at its original default value
  */
 gboolean
-glade_property_original_default (GladeProperty * property)
+glade_property_original_default (GladeProperty *property)
 {
   return glade_property_default_common (property, TRUE);
 }
@@ -885,7 +889,7 @@ glade_property_original_default (GladeProperty * property)
  * Returns: Whether this property is equal to the value provided
  */
 gboolean
-glade_property_equals_value (GladeProperty * property, const GValue * value)
+glade_property_equals_value (GladeProperty *property, const GValue *value)
 {
   g_return_val_if_fail (GLADE_IS_PROPERTY (property), FALSE);
   return GLADE_PROPERTY_GET_KLASS (property)->equals_value (property, value);
@@ -899,7 +903,7 @@ glade_property_equals_value (GladeProperty * property, const GValue * value)
  * Returns: Whether this property is equal to the value provided
  */
 static gboolean
-glade_property_equals_va_list (GladeProperty * property, va_list vl)
+glade_property_equals_va_list (GladeProperty *property, va_list vl)
 {
   GValue *value;
   gboolean ret;
@@ -923,7 +927,7 @@ glade_property_equals_va_list (GladeProperty * property, va_list vl)
  * Returns: Whether this property is equal to the value provided
  */
 gboolean
-glade_property_equals (GladeProperty * property, ...)
+glade_property_equals (GladeProperty *property, ...)
 {
   va_list vl;
   gboolean ret;
@@ -947,7 +951,7 @@ glade_property_equals (GladeProperty * property, ...)
  * Returns: Whether the property was successfully set.
  */
 gboolean
-glade_property_set_value (GladeProperty * property, const GValue * value)
+glade_property_set_value (GladeProperty *property, const GValue *value)
 {
   g_return_val_if_fail (GLADE_IS_PROPERTY (property), FALSE);
   g_return_val_if_fail (value != NULL, FALSE);
@@ -962,7 +966,7 @@ glade_property_set_value (GladeProperty * property, const GValue * value)
  * Sets the property's value
  */
 gboolean
-glade_property_set_va_list (GladeProperty * property, va_list vl)
+glade_property_set_va_list (GladeProperty *property, va_list vl)
 {
   GValue *value;
   gboolean success;
@@ -987,7 +991,7 @@ glade_property_set_va_list (GladeProperty * property, va_list vl)
  * Sets the property's value (in a convenient way)
  */
 gboolean
-glade_property_set (GladeProperty * property, ...)
+glade_property_set (GladeProperty *property, ...)
 {
   va_list vl;
   gboolean success;
@@ -1009,7 +1013,7 @@ glade_property_set (GladeProperty * property, ...)
  * Retrieve the property value
  */
 void
-glade_property_get_value (GladeProperty * property, GValue * value)
+glade_property_get_value (GladeProperty *property, GValue *value)
 {
   g_return_if_fail (GLADE_IS_PROPERTY (property));
   g_return_if_fail (value != NULL);
@@ -1024,7 +1028,7 @@ glade_property_get_value (GladeProperty * property, GValue * value)
  * Retrieve the default property value
  */
 void
-glade_property_get_default (GladeProperty * property, GValue * value)
+glade_property_get_default (GladeProperty *property, GValue *value)
 {
   GParamSpec *pspec;
 
@@ -1044,7 +1048,7 @@ glade_property_get_default (GladeProperty * property, GValue * value)
  * Retrieve the property value
  */
 void
-glade_property_get_va_list (GladeProperty * property, va_list vl)
+glade_property_get_va_list (GladeProperty *property, va_list vl)
 {
   g_return_if_fail (GLADE_IS_PROPERTY (property));
   glade_property_class_set_vl_from_gvalue (property->priv->klass, property->priv->value,
@@ -1059,7 +1063,7 @@ glade_property_get_va_list (GladeProperty * property, va_list vl)
  * Retrieve the property value
  */
 void
-glade_property_get (GladeProperty * property, ...)
+glade_property_get (GladeProperty *property, ...)
 {
   va_list vl;
 
@@ -1077,7 +1081,7 @@ glade_property_get (GladeProperty * property, ...)
  * Synchronize the object with this property
  */
 void
-glade_property_sync (GladeProperty * property)
+glade_property_sync (GladeProperty *property)
 {
   g_return_if_fail (GLADE_IS_PROPERTY (property));
   GLADE_PROPERTY_GET_KLASS (property)->sync (property);
@@ -1090,7 +1094,7 @@ glade_property_sync (GladeProperty * property)
  * Loads the value of @property from the coresponding object instance
  */
 void
-glade_property_load (GladeProperty * property)
+glade_property_load (GladeProperty *property)
 {
   g_return_if_fail (GLADE_IS_PROPERTY (property));
   GLADE_PROPERTY_GET_KLASS (property)->load (property);
@@ -1110,8 +1114,9 @@ glade_property_load (GladeProperty * property)
  * completely loaded
  */
 void
-glade_property_read (GladeProperty * property,
-                     GladeProject * project, GladeXmlNode * prop)
+glade_property_read (GladeProperty *property,
+                     GladeProject  *project,
+                     GladeXmlNode  *prop)
 {
   GValue *gvalue = NULL;
   gchar /* *id, *name, */  * value;
@@ -1177,8 +1182,9 @@ glade_property_read (GladeProperty * property,
  * Write @property to @node
  */
 void
-glade_property_write (GladeProperty * property,
-                      GladeXmlContext * context, GladeXmlNode * node)
+glade_property_write (GladeProperty   *property,
+                      GladeXmlContext *context,
+                      GladeXmlNode    *node)
 {
   GladeXmlNode *prop_node;
   gchar *name, *value;
@@ -1257,7 +1263,7 @@ glade_property_write (GladeProperty * property,
  * or #GParamSpecObject type property.
  */
 void
-glade_property_add_object (GladeProperty * property, GObject * object)
+glade_property_add_object (GladeProperty *property, GObject *object)
 {
   GList *list = NULL, *new_list = NULL;
   GParamSpec *pspec;
@@ -1300,7 +1306,7 @@ glade_property_add_object (GladeProperty * property, GObject * object)
  * or #GParamSpecObject type property.
  */
 void
-glade_property_remove_object (GladeProperty * property, GObject * object)
+glade_property_remove_object (GladeProperty *property, GObject *object)
 {
   GList *list = NULL, *new_list = NULL;
   GParamSpec *pspec;
@@ -1346,7 +1352,7 @@ glade_property_get_class (GladeProperty *property)
 
 /* Parameters for translatable properties. */
 void
-glade_property_i18n_set_comment (GladeProperty * property, const gchar * str)
+glade_property_i18n_set_comment (GladeProperty *property, const gchar *str)
 {
   g_return_if_fail (GLADE_IS_PROPERTY (property));
   if (property->priv->i18n_comment)
@@ -1364,7 +1370,7 @@ glade_property_i18n_get_comment (GladeProperty * property)
 }
 
 void
-glade_property_i18n_set_context (GladeProperty * property, const gchar * str)
+glade_property_i18n_set_context (GladeProperty *property, const gchar *str)
 {
   g_return_if_fail (GLADE_IS_PROPERTY (property));
   if (property->priv->i18n_context)
@@ -1375,15 +1381,15 @@ glade_property_i18n_set_context (GladeProperty * property, const gchar * str)
 }
 
 G_CONST_RETURN gchar *
-glade_property_i18n_get_context (GladeProperty * property)
+glade_property_i18n_get_context (GladeProperty *property)
 {
   g_return_val_if_fail (GLADE_IS_PROPERTY (property), NULL);
   return property->priv->i18n_context;
 }
 
 void
-glade_property_i18n_set_translatable (GladeProperty * property,
-                                      gboolean translatable)
+glade_property_i18n_set_translatable (GladeProperty *property,
+                                      gboolean      translatable)
 {
   g_return_if_fail (GLADE_IS_PROPERTY (property));
   property->priv->i18n_translatable = translatable;
@@ -1391,15 +1397,16 @@ glade_property_i18n_set_translatable (GladeProperty * property,
 }
 
 gboolean
-glade_property_i18n_get_translatable (GladeProperty * property)
+glade_property_i18n_get_translatable (GladeProperty *property)
 {
   g_return_val_if_fail (GLADE_IS_PROPERTY (property), FALSE);
   return property->priv->i18n_translatable;
 }
 
 void
-glade_property_set_sensitive (GladeProperty * property,
-                              gboolean sensitive, const gchar * reason)
+glade_property_set_sensitive (GladeProperty *property,
+                              gboolean       sensitive,
+                              const gchar   *reason)
 {
   g_return_if_fail (GLADE_IS_PROPERTY (property));
 
@@ -1439,15 +1446,16 @@ glade_propert_get_insensitive_tooltip (GladeProperty *property)
 }
 
 gboolean
-glade_property_get_sensitive (GladeProperty * property)
+glade_property_get_sensitive (GladeProperty *property)
 {
   g_return_val_if_fail (GLADE_IS_PROPERTY (property), FALSE);
   return property->priv->sensitive;
 }
 
 void
-glade_property_set_support_warning (GladeProperty * property,
-                                    gboolean disable, const gchar * reason)
+glade_property_set_support_warning (GladeProperty *property,
+                                    gboolean       disable,
+                                    const gchar   *reason)
 {
   gboolean warn_before, warn_after;
 
@@ -1510,7 +1518,7 @@ glade_property_warn_usage (GladeProperty *property)
  * or derived widget code).
  */
 void
-glade_property_set_save_always (GladeProperty * property, gboolean setting)
+glade_property_set_save_always (GladeProperty *property, gboolean setting)
 {
   g_return_if_fail (GLADE_IS_PROPERTY (property));
 
@@ -1525,7 +1533,7 @@ glade_property_set_save_always (GladeProperty * property, gboolean setting)
  * to always be saved regardless of its default value.
  */
 gboolean
-glade_property_get_save_always (GladeProperty * property)
+glade_property_get_save_always (GladeProperty *property)
 {
   g_return_val_if_fail (GLADE_IS_PROPERTY (property), FALSE);
 
@@ -1533,7 +1541,7 @@ glade_property_get_save_always (GladeProperty * property)
 }
 
 void
-glade_property_set_enabled (GladeProperty * property, gboolean enabled)
+glade_property_set_enabled (GladeProperty *property, gboolean enabled)
 {
   gboolean warn_before, warn_after;
 
@@ -1543,8 +1551,7 @@ glade_property_set_enabled (GladeProperty * property, gboolean enabled)
   warn_before = glade_property_warn_usage (property);
 
   property->priv->enabled = enabled;
-  if (enabled)
-    glade_property_sync (property);
+  glade_property_sync (property);
 
   glade_property_fix_state (property);
 
@@ -1575,8 +1582,8 @@ glade_property_make_string (GladeProperty *property)
 }
 
 void
-glade_property_set_widget (GladeProperty      *property,
-			   GladeWidget        *widget)
+glade_property_set_widget (GladeProperty *property,
+			   GladeWidget   *widget)
 {
   g_return_if_fail (GLADE_IS_PROPERTY (property));
 
@@ -1584,7 +1591,7 @@ glade_property_set_widget (GladeProperty      *property,
 }
 
 GladeWidget *
-glade_property_get_widget (GladeProperty      *property)
+glade_property_get_widget (GladeProperty *property)
 {
   g_return_val_if_fail (GLADE_IS_PROPERTY (property), NULL);
 
@@ -1600,7 +1607,7 @@ glade_property_inline_value (GladeProperty *property)
 }
 
 GladePropertyState
-glade_property_get_state (GladeProperty      *property)
+glade_property_get_state (GladeProperty *property)
 {
   g_return_val_if_fail (GLADE_IS_PROPERTY (property), 0);
 

gladeui/glade-signal-class.c

@@ -83,9 +83,9 @@ glade_signal_class_free (GladeSignalClass *signal_class)
 }
 
 void
-glade_signal_class_update_from_node (GladeSignalClass   *signal_class,
-				     GladeXmlNode       *node,
-				     const gchar        *domain)
+glade_signal_class_update_from_node (GladeSignalClass *signal_class,
+				     GladeXmlNode     *node,
+				     const gchar      *domain)
 {
   g_return_if_fail (signal_class != NULL);
   g_return_if_fail (node != NULL);
@@ -109,7 +109,7 @@ glade_signal_class_get_adaptor (const GladeSignalClass *signal_class)
 }
 
 G_CONST_RETURN gchar *
-glade_signal_class_get_name (const GladeSignalClass  *signal_class)
+glade_signal_class_get_name (const GladeSignalClass *signal_class)
 {
   g_return_val_if_fail (signal_class != NULL, NULL);
 
@@ -117,7 +117,7 @@ glade_signal_class_get_name (const GladeSignalClass  *signal_class)
 }
 
 G_CONST_RETURN gchar *
-glade_signal_class_get_type (const GladeSignalClass  *signal_class)
+glade_signal_class_get_type (const GladeSignalClass *signal_class)
 {
   g_return_val_if_fail (signal_class != NULL, NULL);
 
@@ -133,9 +133,9 @@ glade_signal_class_get_flags (const GladeSignalClass *signal_class)
 }
 
 void
-glade_signal_class_set_since (GladeSignalClass   *signal_class,
-			      guint16             since_major,
-			      guint16             since_minor)
+glade_signal_class_set_since (GladeSignalClass *signal_class,
+			      guint16           since_major,
+			      guint16           since_minor)
 {
   g_return_if_fail (signal_class != NULL);
 
@@ -144,7 +144,7 @@ glade_signal_class_set_since (GladeSignalClass   *signal_class,
 }
 
 guint16
-glade_signal_class_since_major (GladeSignalClass   *signal_class)
+glade_signal_class_since_major (GladeSignalClass *signal_class)
 {
   g_return_val_if_fail (signal_class != NULL, 0);
 
@@ -152,7 +152,7 @@ glade_signal_class_since_major (GladeSignalClass   *signal_class)
 }
 
 guint16
-glade_signal_class_since_minor (GladeSignalClass   *signal_class)
+glade_signal_class_since_minor (GladeSignalClass *signal_class)
 {
   g_return_val_if_fail (signal_class != NULL, 0);
 
@@ -160,8 +160,8 @@ glade_signal_class_since_minor (GladeSignalClass   *signal_class)
 }
 
 void
-glade_signal_class_set_deprecated (GladeSignalClass   *signal_class,
-				   gboolean            deprecated)
+glade_signal_class_set_deprecated (GladeSignalClass *signal_class,
+				   gboolean          deprecated)
 {
   g_return_if_fail (signal_class != NULL);
 
@@ -169,7 +169,7 @@ glade_signal_class_set_deprecated (GladeSignalClass   *signal_class,
 }
 
 gboolean
-glade_signal_class_deprecated (GladeSignalClass   *signal_class)
+glade_signal_class_deprecated (GladeSignalClass *signal_class)
 {
   g_return_val_if_fail (signal_class != NULL, FALSE);
 

gladeui/glade-signal-editor.c

@@ -46,11 +46,6 @@
 #include "glade-project.h"
 #include "glade-cell-renderer-icon.h"
 
-G_DEFINE_TYPE (GladeSignalEditor, glade_signal_editor, GTK_TYPE_BOX)
-
-#define GLADE_SIGNAL_EDITOR_GET_PRIVATE(o)  \
-        (G_TYPE_INSTANCE_GET_PRIVATE ((o), GLADE_TYPE_SIGNAL_EDITOR, GladeSignalEditorPrivate))
-
 struct _GladeSignalEditorPrivate
 {
   GtkTreeModel *model;
@@ -92,6 +87,8 @@ enum
 static guint glade_signal_editor_signals[LAST_SIGNAL] = { 0 };
 static gboolean tree_path_focus_idle (gpointer data);
 
+G_DEFINE_TYPE_WITH_PRIVATE (GladeSignalEditor, glade_signal_editor, GTK_TYPE_BOX)
+
 /* Utils */
 static inline gboolean
 glade_signal_is_dummy (GladeSignal *signal)
@@ -823,7 +820,7 @@ glade_signal_editor_enable_dnd (GladeSignalEditor *editor, gboolean enabled)
 static void
 glade_signal_editor_dispose (GObject *object)
 {
-  GladeSignalEditorPrivate *priv = GLADE_SIGNAL_EDITOR_GET_PRIVATE (object);
+  GladeSignalEditorPrivate *priv = GLADE_SIGNAL_EDITOR (object)->priv;
 
   g_clear_object (&priv->detail_store);
   g_clear_object (&priv->handler_store);
@@ -1242,7 +1239,7 @@ glade_signal_editor_init (GladeSignalEditor *self)
   GtkCellArea *cell_area;
   GladeSignalEditorPrivate *priv;
 	
-  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GLADE_TYPE_SIGNAL_EDITOR, GladeSignalEditorPrivate);
+  self->priv = glade_signal_editor_get_instance_private (self);
   priv = self->priv;
 	
   /* Create signal tree */
@@ -1462,8 +1459,6 @@ glade_signal_editor_class_init (GladeSignalEditorClass *klass)
 
   klass->callback_suggestions = glade_signal_editor_callback_suggestions;
   klass->detail_suggestions = glade_signal_editor_detail_suggestions;
-  
-  g_type_class_add_private (klass, sizeof (GladeSignalEditorPrivate));
 
   /**
    * GladeSignalEditor::signal-activated:

gladeui/glade-signal-model.c

@@ -58,6 +58,7 @@ static void on_glade_signal_model_changed (GladeWidget *widget, const GladeSigna
 static void on_glade_widget_support_changed (GladeWidget *widget, GladeSignalModel *model);
 
 G_DEFINE_TYPE_WITH_CODE (GladeSignalModel, glade_signal_model, G_TYPE_OBJECT,
+                         G_ADD_PRIVATE (GladeSignalModel)
                          G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_MODEL,
                                                 gtk_tree_model_iface_init);
                          G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_DRAG_SOURCE,
@@ -78,7 +79,7 @@ g_ptr_array_find (GPtrArray *array, gpointer data)
 static void
 glade_signal_model_init (GladeSignalModel *object)
 {
-  object->priv = G_TYPE_INSTANCE_GET_PRIVATE (object, GLADE_TYPE_SIGNAL_MODEL, GladeSignalModelPrivate);
+  object->priv = glade_signal_model_get_instance_private (object);
 
   object->priv->dummy_signals = 
     g_hash_table_new_full (g_str_hash, g_str_equal, NULL, (GDestroyNotify) g_object_unref);
@@ -182,8 +183,6 @@ glade_signal_model_class_init (GladeSignalModelClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (GladeSignalModelPrivate));
-
   object_class->finalize = glade_signal_model_finalize;
   object_class->set_property = glade_signal_model_set_property;
   object_class->get_property = glade_signal_model_get_property;

gladeui/glade-signal.c

@@ -61,7 +61,7 @@ enum {
 #define GladeSignalClass GladeSignalKlass
 #define glade_signal_class_init glade_signal_klass_init
 
-G_DEFINE_TYPE (GladeSignal, glade_signal, G_TYPE_OBJECT)
+G_DEFINE_TYPE_WITH_PRIVATE (GladeSignal, glade_signal, G_TYPE_OBJECT)
 
 #undef GladeSignalClass
 #undef glade_signal_class_init
@@ -156,9 +156,7 @@ glade_signal_set_property (GObject *object,
 static void
 glade_signal_init (GladeSignal *signal)
 {
-  signal->priv = G_TYPE_INSTANCE_GET_PRIVATE (signal,
-					      GLADE_TYPE_SIGNAL,
-					      GladeSignalPrivate);
+  signal->priv = glade_signal_get_instance_private (signal);
 }
 
 static void
@@ -218,8 +216,6 @@ glade_signal_klass_init (GladeSignalKlass *klass)
   
   /* Install all properties */
   g_object_class_install_properties (object_class, N_PROPERTIES, properties);
-
-  g_type_class_add_private (klass, sizeof (GladeSignalPrivate));
 }
 
 /**
@@ -236,10 +232,10 @@ glade_signal_klass_init (GladeSignalKlass *klass)
  */
 GladeSignal *
 glade_signal_new (const GladeSignalClass *sig_class,
-                  const gchar *handler,
-                  const gchar *userdata, 
-		  gboolean after, 
-		  gboolean swapped)
+                  const gchar            *handler,
+                  const gchar            *userdata, 
+		  gboolean                after, 
+		  gboolean                swapped)
 {
   g_return_val_if_fail (sig_class != NULL, NULL);
 
@@ -316,9 +312,9 @@ glade_signal_clone (const GladeSignal *signal)
  * Writes @signal to @node
  */
 void
-glade_signal_write (GladeSignal *signal,
+glade_signal_write (GladeSignal     *signal,
                     GladeXmlContext *context,
-                    GladeXmlNode *node)
+                    GladeXmlNode    *node)
 {
   GladeXmlNode *signal_node;
   gchar *name;

gladeui/glade-widget-action.c

@@ -53,14 +53,12 @@ struct _GladeWidgetActionPrivate
 
 static GParamSpec *properties[N_PROPERTIES];
 
-G_DEFINE_TYPE (GladeWidgetAction, glade_widget_action, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_PRIVATE (GladeWidgetAction, glade_widget_action, G_TYPE_OBJECT);
 
 static void
-glade_widget_action_init (GladeWidgetAction * object)
+glade_widget_action_init (GladeWidgetAction *object)
 {
-  object->priv = G_TYPE_INSTANCE_GET_PRIVATE (object,
-					      GLADE_TYPE_WIDGET_ACTION,
-					      GladeWidgetActionPrivate);
+  object->priv = glade_widget_action_get_instance_private (object);
 
   object->priv->sensitive = TRUE;
   object->priv->visible   = TRUE;
@@ -68,7 +66,7 @@ glade_widget_action_init (GladeWidgetAction * object)
 }
 
 static void
-glade_widget_action_finalize (GObject * object)
+glade_widget_action_finalize (GObject *object)
 {
   GladeWidgetAction *action = GLADE_WIDGET_ACTION (object);
 
@@ -82,9 +80,9 @@ glade_widget_action_finalize (GObject * object)
 }
 
 static GObject *
-glade_widget_action_constructor (GType type,
-                                 guint n_construct_properties,
-                                 GObjectConstructParam * construct_properties)
+glade_widget_action_constructor (GType                  type,
+                                 guint                  n_construct_properties,
+                                 GObjectConstructParam *construct_properties)
 {
   GladeWidgetAction *action;
   GObject *object;
@@ -118,8 +116,10 @@ glade_widget_action_constructor (GType type,
 }
 
 static void
-glade_widget_action_set_property (GObject * object, guint prop_id,
-                                  const GValue * value, GParamSpec * pspec)
+glade_widget_action_set_property (GObject      *object,
+                                  guint         prop_id,
+                                  const GValue *value,
+                                  GParamSpec   *pspec)
 {
   GladeWidgetAction *action = GLADE_WIDGET_ACTION (object);
 
@@ -143,8 +143,10 @@ glade_widget_action_set_property (GObject * object, guint prop_id,
 }
 
 static void
-glade_widget_action_get_property (GObject * object, guint prop_id,
-                                  GValue * value, GParamSpec * pspec)
+glade_widget_action_get_property (GObject    *object,
+                                  guint       prop_id,
+                                  GValue     *value,
+                                  GParamSpec *pspec)
 {
   GladeWidgetAction *action = GLADE_WIDGET_ACTION (object);
 
@@ -168,11 +170,9 @@ glade_widget_action_get_property (GObject * object, guint prop_id,
 }
 
 static void
-glade_widget_action_class_init (GladeWidgetActionClass * klass)
+glade_widget_action_class_init (GladeWidgetActionClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  glade_widget_action_parent_class =
-      G_OBJECT_CLASS (g_type_class_peek_parent (klass));
 
   object_class->constructor = glade_widget_action_constructor;
   object_class->finalize = glade_widget_action_finalize;
@@ -201,8 +201,6 @@ glade_widget_action_class_init (GladeWidgetActionClass * klass)
 
   /* Install all properties */
   g_object_class_install_properties (object_class, N_PROPERTIES, properties);
-
-  g_type_class_add_private (klass, sizeof (GladeWidgetActionPrivate));
 }
 
 /**
@@ -214,8 +212,8 @@ glade_widget_action_class_init (GladeWidgetActionClass * klass)
  *
  */
 void
-glade_widget_action_set_sensitive (GladeWidgetAction * action,
-                                   gboolean sensitive)
+glade_widget_action_set_sensitive (GladeWidgetAction *action,
+                                   gboolean           sensitive)
 {
   g_return_if_fail (GLADE_IS_WIDGET_ACTION (action));
 
@@ -269,7 +267,7 @@ glade_widget_action_get_class (GladeWidgetAction *action)
  *                         GWActionClass                       *
  ***************************************************************/
 static const gchar *
-gwa_action_path_get_id (const gchar * action_path)
+gwa_action_path_get_id (const gchar *action_path)
 {
   const gchar *id;
 
@@ -304,7 +302,7 @@ glade_widget_action_class_new (const gchar *path)
  * Returns: a newlly allocated copy of @action.
  */
 GWActionClass *
-glade_widget_action_class_clone (GWActionClass * action)
+glade_widget_action_class_clone (GWActionClass *action)
 {
   GWActionClass *copy;
   GList *l;

gladeui/glade-widget-adaptor.c

@@ -55,9 +55,6 @@
 
 #define DEFAULT_ICON_NAME "widget-gtk-frame"
 
-#define GLADE_WIDGET_ADAPTOR_GET_PRIVATE(o)  \
-        (G_TYPE_INSTANCE_GET_PRIVATE ((o), GLADE_TYPE_WIDGET_ADAPTOR, GladeWidgetAdaptorPrivate))
-
 struct _GladeWidgetAdaptorPrivate
 {
   GType        type;                /* GType of the widget */
@@ -149,7 +146,7 @@ static GHashTable *adaptor_hash = NULL;
  * no reason for it since the autogenerated class for GtWidget is GladeGtkWidgetAdaptor
  * TODO: rename GladeWidgetAdaptor to GladeGObjectAdator or GladeObjectAdator
  */
-G_DEFINE_TYPE (GladeWidgetAdaptor, glade_widget_adaptor, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_PRIVATE (GladeWidgetAdaptor, glade_widget_adaptor, G_TYPE_OBJECT);
 
 /*******************************************************************************
                               Helper functions
@@ -230,7 +227,8 @@ gwa_gtype_hash (gconstpointer v)
 }
 
 static gboolean
-glade_widget_adaptor_hash_find (gpointer key, gpointer value,
+glade_widget_adaptor_hash_find (gpointer key,
+                                gpointer value, 
                                 gpointer user_data)
 {
   GladeWidgetAdaptor *adaptor = value;
@@ -259,6 +257,29 @@ glade_abort_if_derived_adaptors_exist (GType type)
     }
 }
 
+static GladeInternalChild *
+gwa_internal_child_find (GList *list, const gchar *name)
+{
+  GList *l;
+
+  for (l = list; l; l = g_list_next (l))
+    {
+      GladeInternalChild *data = l->data;
+
+      if (strcmp (data->name, name) == 0)
+        return data;
+      
+      if (data->children)
+        {
+          GladeInternalChild *child;
+          if ((child = gwa_internal_child_find (data->children, name)))
+            return child;
+        }
+    }
+  
+  return NULL;
+}
+
 /*******************************************************************************
                      Base Object Implementation detail
  *******************************************************************************/
@@ -398,8 +419,9 @@ gwa_clone_parent_properties (GladeWidgetAdaptor *adaptor, gboolean is_packing)
 
 static void
 gwa_setup_introspected_props_from_pspecs (GladeWidgetAdaptor *adaptor,
-                                          GParamSpec **specs,
-                                          gint n_specs, gboolean is_packing)
+                                          GParamSpec        **specs,
+                                          gint                n_specs,
+                                          gboolean            is_packing)
 {
   GladeWidgetAdaptor *parent_adaptor = gwa_get_parent_adaptor (adaptor);
   GladePropertyClass *property_class;
@@ -433,7 +455,8 @@ gwa_setup_introspected_props_from_pspecs (GladeWidgetAdaptor *adaptor,
 
 static void
 gwa_setup_properties (GladeWidgetAdaptor *adaptor,
-                      GObjectClass *object_class, gboolean is_packing)
+                      GObjectClass       *object_class,
+                      gboolean            is_packing)
 {
   GParamSpec **specs = NULL;
   guint n_specs = 0;
@@ -583,9 +606,9 @@ gwa_internal_children_clone (GList *children)
 }
 
 static GObject *
-glade_widget_adaptor_constructor (GType type,
-                                  guint n_construct_properties,
-                                  GObjectConstructParam * construct_properties)
+glade_widget_adaptor_constructor (GType                  type,
+                                  guint                  n_construct_properties,
+                                  GObjectConstructParam *construct_properties)
 {
   GladeWidgetAdaptor *adaptor, *parent_adaptor;
   GObject *ret_obj;
@@ -672,14 +695,14 @@ glade_widget_adaptor_constructor (GType type,
 }
 
 static void
-gwa_packing_default_free (GladePackingDefault * def)
+gwa_packing_default_free (GladePackingDefault *def)
 {
   g_free (def->id);
   g_free (def->value);
 }
 
 static void
-gwa_child_packing_free (GladeChildPacking * packing)
+gwa_child_packing_free (GladeChildPacking *packing)
 {
   g_free (packing->parent_name);
 
@@ -779,10 +802,10 @@ glade_widget_adaptor_finalize (GObject *object)
 }
 
 static void
-glade_widget_adaptor_real_set_property (GObject *object,
-                                        guint prop_id,
+glade_widget_adaptor_real_set_property (GObject      *object,
+                                        guint         prop_id,
                                         const GValue *value,
-                                        GParamSpec *pspec)
+                                        GParamSpec   *pspec)
 {
   GladeWidgetAdaptor *adaptor;
 
@@ -834,9 +857,9 @@ glade_widget_adaptor_real_set_property (GObject *object,
 }
 
 static void
-glade_widget_adaptor_real_get_property (GObject *object,
-                                        guint prop_id,
-                                        GValue *value,
+glade_widget_adaptor_real_get_property (GObject    *object,
+                                        guint       prop_id,
+                                        GValue     *value,
                                         GParamSpec *pspec)
 {
 
@@ -884,8 +907,8 @@ glade_widget_adaptor_real_get_property (GObject *object,
  *******************************************************************************/
 static GladeWidget *
 glade_widget_adaptor_object_create_widget (GladeWidgetAdaptor *adaptor,
-                                           const gchar *first_property_name,
-                                           va_list var_args)
+                                           const gchar        *first_property_name,
+                                           va_list             var_args)
 {
   return GLADE_WIDGET (g_object_new_valist (GLADE_TYPE_WIDGET,
                                             first_property_name, var_args));
@@ -893,8 +916,8 @@ glade_widget_adaptor_object_create_widget (GladeWidgetAdaptor *adaptor,
 
 static GObject *
 glade_widget_adaptor_object_construct_object (GladeWidgetAdaptor *adaptor,
-                                              guint n_parameters,
-                                              GParameter *parameters)
+                                              guint               n_parameters,
+                                              GParameter         *parameters)
 {
   return g_object_newv (adaptor->priv->type, n_parameters, parameters);
 }
@@ -909,8 +932,8 @@ glade_widget_adaptor_object_destroy_object (GladeWidgetAdaptor *adaptor,
 
 static GObject *
 glade_widget_adaptor_object_get_internal_child (GladeWidgetAdaptor *adaptor,
-                                                GObject *object,
-                                                const gchar *name)
+                                                GObject            *object,
+                                                const gchar        *name)
 {
   static GtkBuilder *builder = NULL;
   
@@ -939,26 +962,26 @@ glade_widget_adaptor_object_add_verify (GladeWidgetAdaptor *adaptor,
 
 static void
 glade_widget_adaptor_object_set_property (GladeWidgetAdaptor *adaptor,
-                                          GObject *object,
-                                          const gchar *property_name,
-                                          const GValue *value)
+                                          GObject            *object,
+                                          const gchar        *property_name,
+                                          const GValue       *value)
 {
   g_object_set_property (object, property_name, value);
 }
 
 static void
 glade_widget_adaptor_object_get_property (GladeWidgetAdaptor *adaptor,
-                                          GObject *object,
-                                          const gchar *property_name,
-                                          GValue *value)
+                                          GObject            *object,
+                                          const gchar        *property_name,
+                                          GValue             *value)
 {
   g_object_get_property (object, property_name, value);
 }
 
 static void
 glade_widget_adaptor_object_action_activate (GladeWidgetAdaptor *adaptor,
-                                             GObject *object,
-                                             const gchar *action_id)
+                                             GObject            *object,
+                                             const gchar        *action_id)
 {
   g_message ("No action_activate() support in adaptor %s for action '%s'",
              adaptor->priv->name, action_id);
@@ -966,9 +989,9 @@ glade_widget_adaptor_object_action_activate (GladeWidgetAdaptor *adaptor,
 
 static void
 glade_widget_adaptor_object_child_action_activate (GladeWidgetAdaptor *adaptor,
-                                                   GObject *container,
-                                                   GObject *object,
-                                                   const gchar *action_id)
+                                                   GObject            *container,
+                                                   GObject            *object,
+                                                   const gchar        *action_id)
 {
   g_message ("No child_action_activate() support in adaptor %s for action '%s'",
              adaptor->priv->name, action_id);
@@ -976,8 +999,8 @@ glade_widget_adaptor_object_child_action_activate (GladeWidgetAdaptor *adaptor,
 
 static void
 glade_widget_adaptor_object_read_widget (GladeWidgetAdaptor *adaptor,
-                                         GladeWidget *widget,
-                                         GladeXmlNode *node)
+                                         GladeWidget        *widget,
+                                         GladeXmlNode       *node)
 {
   GladeXmlNode *iter_node;
   GladeSignal *signal;
@@ -1050,9 +1073,9 @@ glade_widget_adaptor_object_read_widget (GladeWidgetAdaptor *adaptor,
 
 static void
 glade_widget_adaptor_object_write_widget (GladeWidgetAdaptor *adaptor,
-                                          GladeWidget *widget,
-                                          GladeXmlContext *context,
-                                          GladeXmlNode *node)
+                                          GladeWidget        *widget,
+                                          GladeXmlContext    *context,
+                                          GladeXmlNode       *node)
 {
   GList *props;
 
@@ -1070,17 +1093,17 @@ glade_widget_adaptor_object_write_widget (GladeWidgetAdaptor *adaptor,
 
 static void
 glade_widget_adaptor_object_write_widget_after (GladeWidgetAdaptor *adaptor,
-						GladeWidget *widget,
-						GladeXmlContext *context,
-						GladeXmlNode *node)
+						GladeWidget        *widget,
+						GladeXmlContext    *context,
+						GladeXmlNode       *node)
 {
 
 }
 
 static void
 glade_widget_adaptor_object_read_child (GladeWidgetAdaptor *adaptor,
-                                        GladeWidget *widget,
-                                        GladeXmlNode *node)
+                                        GladeWidget        *widget,
+                                        GladeXmlNode       *node)
 {
   GladeXmlNode *widget_node, *packing_node, *iter_node;
   GladeWidget *child_widget;
@@ -1156,9 +1179,9 @@ glade_widget_adaptor_object_read_child (GladeWidgetAdaptor *adaptor,
 
 static void
 glade_widget_adaptor_object_write_child (GladeWidgetAdaptor *adaptor,
-                                         GladeWidget *widget,
-                                         GladeXmlContext *context,
-                                         GladeXmlNode *node)
+                                         GladeWidget        *widget,
+                                         GladeXmlContext    *context,
+                                         GladeXmlNode       *node)
 {
   GladeXmlNode *child_node, *packing_node;
   GList *props;
@@ -1260,7 +1283,7 @@ glade_widget_adaptor_get_eprop_type (GParamSpec *pspec)
 static GladeEditorProperty *
 glade_widget_adaptor_object_create_eprop (GladeWidgetAdaptor *adaptor,
                                           GladePropertyClass *klass,
-                                          gboolean use_command)
+                                          gboolean            use_command)
 {
   GladeEditorProperty *eprop;
   GParamSpec          *pspec;
@@ -1289,7 +1312,7 @@ glade_widget_adaptor_object_create_eprop (GladeWidgetAdaptor *adaptor,
 static gchar *
 glade_widget_adaptor_object_string_from_value (GladeWidgetAdaptor *adaptor,
                                                GladePropertyClass *klass,
-                                               const GValue *value)
+                                               const GValue       *value)
 {
   return glade_property_class_make_string_from_gvalue (klass, value);
 }
@@ -1301,13 +1324,14 @@ glade_widget_adaptor_object_create_editable (GladeWidgetAdaptor *adaptor,
   return (GladeEditable *) glade_editor_table_new (adaptor, type);
 }
 
-static GList *
-glade_widget_adaptor_object_get_children (GladeWidgetAdaptor *adaptor,
-                                          GObject *object)
+static void
+glade_internal_child_append (GladeWidgetAdaptor *adaptor,
+                             GObject            *object,
+                             GList              *list,
+                             GList             **children)
 {
-  GList *list = adaptor->priv->internal_children;
-  GList *l, *children = NULL;
-  
+  GList *l;
+
   for (l = list; l; l = g_list_next (l))
     {
       GladeInternalChild *internal = l->data;
@@ -1317,8 +1341,45 @@ glade_widget_adaptor_object_get_children (GladeWidgetAdaptor *adaptor,
                                                        object,
                                                        internal->name);
       if (child)
-        children = g_list_prepend (children, child);
+        *children = g_list_prepend (*children, child);
     }
+}
+
+static GList *
+glade_widget_adaptor_object_get_children (GladeWidgetAdaptor *adaptor,
+                                          GObject *object)
+{
+  GladeWidget *gwidget = glade_widget_get_from_gobject (object);
+  GList *children = NULL;
+  const gchar *name;
+
+  if (gwidget && (name = glade_widget_get_internal (gwidget)))
+    {
+      GladeWidget *parent = gwidget;
+
+      /* Get non internal parent */
+      while ((parent = glade_widget_get_parent (parent)) &&
+             glade_widget_get_internal (parent));
+
+      if (parent)
+        {
+          GladeWidgetAdaptor *padaptor = glade_widget_get_adaptor (parent);
+          GladeInternalChild *internal;
+
+          internal = gwa_internal_child_find (padaptor->priv->internal_children,
+                                              name);
+
+          if (internal && internal->children)
+            glade_internal_child_append (padaptor, glade_widget_get_object (parent),
+                                         internal->children, &children);
+        }
+
+      return children;
+    }
+
+  glade_internal_child_append (adaptor, object,
+                               adaptor->priv->internal_children,
+                               &children);
 
   return children;
 }
@@ -1330,7 +1391,7 @@ glade_widget_adaptor_object_get_children (GladeWidgetAdaptor *adaptor,
 static void
 glade_widget_adaptor_init (GladeWidgetAdaptor *adaptor)
 {
-  adaptor->priv = GLADE_WIDGET_ADAPTOR_GET_PRIVATE (adaptor);
+  adaptor->priv = glade_widget_adaptor_get_instance_private (adaptor);
 
 }
 
@@ -1448,8 +1509,6 @@ glade_widget_adaptor_class_init (GladeWidgetAdaptorClass *adaptor_class)
        g_param_spec_pointer
        ("cursor", _("Cursor"),
         _("A cursor for inserting widgets in the UI"), G_PARAM_READABLE));
-
-  g_type_class_add_private (adaptor_class, sizeof (GladeWidgetAdaptorPrivate));
 }
 
 /*******************************************************************************
@@ -1482,7 +1541,8 @@ gwa_warn_deprecated_if_symbol_found (GladeXmlNode *node, gchar *tagname)
 
 static void
 gwa_extend_with_node_load_sym (GladeWidgetAdaptorClass *klass,
-                               GladeXmlNode *node, GModule *module)
+                               GladeXmlNode            *node,
+                               GModule                 *module)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
   gpointer symbol;
@@ -1623,7 +1683,7 @@ gwa_extend_with_node_load_sym (GladeWidgetAdaptorClass *klass,
 
 static void
 gwa_derived_class_init (GladeWidgetAdaptorClass *adaptor_class,
-                        GWADerivedClassData *data)
+                        GWADerivedClassData     *data)
 {
   GladeXmlNode *node = data->node;
   GModule *module = data->module;
@@ -1852,7 +1912,7 @@ gwa_default_from_child_packing (GladeChildPacking *packing, const gchar *id)
 
 static GladeChildPacking *
 glade_widget_adaptor_get_child_packing (GladeWidgetAdaptor *child_adaptor,
-                                        const gchar *parent_name)
+                                        const gchar        *parent_name)
 {
   GList *l;
 
@@ -1871,7 +1931,7 @@ glade_widget_adaptor_get_child_packing (GladeWidgetAdaptor *child_adaptor,
 
 static void
 gwa_set_packing_defaults_from_node (GladeWidgetAdaptor *adaptor,
-                                    GladeXmlNode *node)
+                                    GladeXmlNode       *node)
 {
   GladeXmlNode *child;
 
@@ -1949,11 +2009,11 @@ gwa_set_packing_defaults_from_node (GladeWidgetAdaptor *adaptor,
 
 static void
 gwa_update_properties_from_node (GladeWidgetAdaptor *adaptor,
-                                 GladeXmlNode *node,
-                                 GModule *module,
-                                 GList **properties,
-                                 const gchar *domain,
-                                 gboolean is_packing)
+                                 GladeXmlNode       *node,
+                                 GModule            *module,
+                                 GList             **properties,
+                                 const gchar        *domain,
+                                 gboolean            is_packing)
 {
   GladeXmlNode *child;
 
@@ -2151,9 +2211,9 @@ pspec_dup (GParamSpec *spec)
 
 static void
 gwa_update_properties_from_type (GladeWidgetAdaptor *adaptor,
-                                 GType type,
-                                 GList **properties,
-                                 gboolean is_packing)
+                                 GType               type,
+                                 GList             **properties,
+                                 gboolean            is_packing)
 {
   gpointer object_class = g_type_class_ref (type);
   GParamSpec **specs = NULL, *spec;
@@ -2216,10 +2276,10 @@ gwa_update_properties_from_type (GladeWidgetAdaptor *adaptor,
 
 static void
 gwa_action_update_from_node (GladeWidgetAdaptor *adaptor,
-                             gboolean is_packing,
-                             GladeXmlNode *node,
-                             const gchar *domain,
-                             gchar *group_path)
+                             gboolean            is_packing,
+                             GladeXmlNode       *node,
+                             const gchar        *domain,
+                             gchar              *group_path)
 {
   GladeXmlNode *child;
   gchar *id, *label, *stock, *action_path;
@@ -2307,31 +2367,9 @@ gwa_set_signals_from_node (GladeWidgetAdaptor *adaptor,
     }
 }
 
-static GladeInternalChild *
-gwa_internal_child_find (GList *list, gchar *name)
-{
-  GList *l;
-
-  for (l = list; l; l = g_list_next (l))
-    {
-      GladeInternalChild *data = l->data;
-
-      if (strcmp (data->name, name) == 0)
-        return data;
-      
-      if (data->children)
-        {
-          GladeInternalChild *child;
-          if ((child = gwa_internal_child_find (data->children, name)))
-            return child;
-        }
-    }
-  
-  return NULL;
-}
-
 static GList *
-gwa_internal_children_update_from_node (GList *internal_children, GladeXmlNode *node)
+gwa_internal_children_update_from_node (GList        *internal_children,
+                                        GladeXmlNode *node)
 {
   GList *retval = internal_children;
   GladeXmlNode *child, *children;
@@ -2365,9 +2403,9 @@ gwa_internal_children_update_from_node (GList *internal_children, GladeXmlNode *
 
 static gboolean
 gwa_extend_with_node (GladeWidgetAdaptor *adaptor,
-                      GladeXmlNode *node,
-                      GModule *module,
-                      const gchar *domain)
+                      GladeXmlNode       *node,
+                      GModule            *module,
+                      const gchar        *domain)
 {
   GladeXmlNode *child;
   gchar *child_type;
@@ -2423,7 +2461,7 @@ gwa_extend_with_node (GladeWidgetAdaptor *adaptor,
  */
 static gchar *
 create_icon_name_for_object_class (const gchar *class_name,
-                                   GType class_type,
+                                   GType        class_type,
                                    const gchar *icon_name,
                                    const gchar *icon_prefix,
                                    const gchar *generic_name)
@@ -2619,7 +2657,7 @@ generate_deprecated_icon (const gchar *icon_name)
 GladeWidgetAdaptor *
 glade_widget_adaptor_from_catalog (GladeCatalog *catalog,
                                    GladeXmlNode *class_node,
-                                   GModule *module)
+                                   GModule      *module)
 {
   GladeWidgetAdaptor *adaptor = NULL;
   gchar *name, *generic_name, *icon_name, *adaptor_icon_name, *adaptor_name,
@@ -2884,11 +2922,11 @@ glade_widget_adaptor_from_catalog (GladeCatalog *catalog,
  *          @internal_object of name @internal_name
  */
 GladeWidget *
-glade_widget_adaptor_create_internal (GladeWidget *parent,
-                                      GObject *internal_object,
-                                      const gchar *internal_name,
-                                      const gchar *parent_name,
-                                      gboolean anarchist,
+glade_widget_adaptor_create_internal (GladeWidget      *parent,
+                                      GObject          *internal_object,
+                                      const gchar      *internal_name,
+                                      const gchar      *parent_name,
+                                      gboolean          anarchist,
                                       GladeCreateReason reason)
 {
   GladeWidgetAdaptor *adaptor;
@@ -2937,8 +2975,9 @@ glade_widget_adaptor_create_internal (GladeWidget *parent,
  * this macro returns the newly created #GladeWidget
  */
 GladeWidget *
-glade_widget_adaptor_create_widget_real (gboolean query,
-                                         const gchar *first_property, ...)
+glade_widget_adaptor_create_widget_real (gboolean     query,
+                                         const gchar *first_property,
+                                         ...)
 {
   GladeWidgetAdaptor *adaptor;
   GladeWidget *gwidget;
@@ -2989,8 +3028,8 @@ typedef struct
 
 
 static void
-search_adaptor_by_name (GType *type,
-                        GladeWidgetAdaptor *adaptor,
+search_adaptor_by_name (GType                  *type,
+                        GladeWidgetAdaptor     *adaptor,
                         GladeAdaptorSearchPair *pair)
 {
   if (!strcmp (adaptor->priv->name, pair->name))
@@ -3050,7 +3089,7 @@ glade_widget_adaptor_get_by_type (GType type)
  **/
 GladeWidgetAdaptor *
 glade_widget_adaptor_from_pspec (GladeWidgetAdaptor *adaptor,
-                                 GParamSpec *spec)
+                                 GParamSpec         *spec)
 {
   GladeWidgetAdaptor *spec_adaptor;
   GType spec_type = spec->owner_type;
@@ -3085,7 +3124,7 @@ glade_widget_adaptor_from_pspec (GladeWidgetAdaptor *adaptor,
  */
 GladePropertyClass *
 glade_widget_adaptor_get_property_class (GladeWidgetAdaptor *adaptor,
-                                         const gchar *name)
+                                         const gchar        *name)
 {
   GList *list;
   GladePropertyClass *pclass;
@@ -3111,7 +3150,7 @@ glade_widget_adaptor_get_property_class (GladeWidgetAdaptor *adaptor,
  */
 GladePropertyClass *
 glade_widget_adaptor_get_pack_property_class (GladeWidgetAdaptor *adaptor,
-                                              const gchar *name)
+                                              const gchar        *name)
 {
   GList *list;
   GladePropertyClass *pclass;
@@ -3135,8 +3174,8 @@ glade_widget_adaptor_get_pack_property_class (GladeWidgetAdaptor *adaptor,
  */
 GParameter *
 glade_widget_adaptor_default_params (GladeWidgetAdaptor *adaptor,
-                                     gboolean construct,
-                                     guint *n_params)
+                                     gboolean            construct,
+                                     guint              *n_params)
 {
   GArray *params;
   GObjectClass *oclass;
@@ -3217,8 +3256,8 @@ glade_widget_adaptor_default_params (GladeWidgetAdaptor *adaptor,
  */
 GObject *
 glade_widget_adaptor_construct_object (GladeWidgetAdaptor *adaptor,
-                                       guint n_parameters,
-                                       GParameter *parameters)
+                                       guint               n_parameters,
+                                       GParameter         *parameters)
 {
   g_return_val_if_fail (GLADE_IS_WIDGET_ADAPTOR (adaptor), NULL);
 
@@ -3245,10 +3284,10 @@ glade_widget_adaptor_destroy_object (GladeWidgetAdaptor *adaptor,
 
 static void
 gwa_internal_children_create (GladeWidgetAdaptor *adaptor,
-                              GObject *parent_object,
-                              GObject *object,
-                              GList *children,
-                              GladeCreateReason reason)
+                              GObject            *parent_object,
+                              GObject            *object,
+                              GList              *children,
+                              GladeCreateReason  reason)
 {
   gchar *parent_name = adaptor->priv->generic_name;
   GladeWidget *gobject = glade_widget_get_from_gobject (object);
@@ -3288,8 +3327,8 @@ gwa_internal_children_create (GladeWidgetAdaptor *adaptor,
  */
 void
 glade_widget_adaptor_post_create (GladeWidgetAdaptor *adaptor,
-                                  GObject *object,
-                                  GladeCreateReason reason)
+                                  GObject            *object,
+                                  GladeCreateReason   reason)
 {
   g_return_if_fail (GLADE_IS_WIDGET_ADAPTOR (adaptor));
   g_return_if_fail (G_IS_OBJECT (object));
@@ -3325,8 +3364,8 @@ glade_widget_adaptor_post_create (GladeWidgetAdaptor *adaptor,
  */
 GObject *
 glade_widget_adaptor_get_internal_child (GladeWidgetAdaptor *adaptor,
-                                         GObject *object,
-                                         const gchar *internal_name)
+                                         GObject            *object,
+                                         const gchar        *internal_name)
 {
   g_return_val_if_fail (GLADE_IS_WIDGET_ADAPTOR (adaptor), NULL);
   g_return_val_if_fail (G_IS_OBJECT (object), NULL);
@@ -3356,9 +3395,9 @@ glade_widget_adaptor_get_internal_child (GladeWidgetAdaptor *adaptor,
  */
 void
 glade_widget_adaptor_set_property (GladeWidgetAdaptor *adaptor,
-                                   GObject *object,
-                                   const gchar *property_name,
-                                   const GValue *value)
+                                   GObject            *object,
+                                   const gchar        *property_name,
+                                   const GValue       *value)
 {
   g_return_if_fail (GLADE_IS_WIDGET_ADAPTOR (adaptor));
   g_return_if_fail (G_IS_OBJECT (object));
@@ -3383,9 +3422,9 @@ glade_widget_adaptor_set_property (GladeWidgetAdaptor *adaptor,
  */
 void
 glade_widget_adaptor_get_property (GladeWidgetAdaptor *adaptor,
-                                   GObject *object,
-                                   const gchar *property_name,
-                                   GValue *value)
+                                   GObject            *object,
+                                   const gchar        *property_name,
+                                   GValue             *value)
 {
   g_return_if_fail (GLADE_IS_WIDGET_ADAPTOR (adaptor));
   g_return_if_fail (G_IS_OBJECT (object));
@@ -3416,9 +3455,9 @@ glade_widget_adaptor_get_property (GladeWidgetAdaptor *adaptor,
  */
 gboolean
 glade_widget_adaptor_verify_property (GladeWidgetAdaptor *adaptor,
-                                      GObject *object,
-                                      const gchar *property_name,
-                                      const GValue *value)
+                                      GObject            *object,
+                                      const gchar        *property_name,
+                                      const GValue       *value)
 {
   g_return_val_if_fail (GLADE_IS_WIDGET_ADAPTOR (adaptor), FALSE);
   g_return_val_if_fail (G_IS_OBJECT (object), FALSE);
@@ -3473,8 +3512,8 @@ glade_widget_adaptor_add_verify (GladeWidgetAdaptor *adaptor,
  */
 void
 glade_widget_adaptor_add (GladeWidgetAdaptor *adaptor,
-                          GObject *container,
-                          GObject *child)
+                          GObject            *container,
+                          GObject            *child)
 {
   g_return_if_fail (GLADE_IS_WIDGET_ADAPTOR (adaptor));
   g_return_if_fail (G_IS_OBJECT (container));
@@ -3498,8 +3537,8 @@ glade_widget_adaptor_add (GladeWidgetAdaptor *adaptor,
  */
 void
 glade_widget_adaptor_remove (GladeWidgetAdaptor *adaptor,
-                             GObject *container,
-                             GObject *child)
+                             GObject            *container,
+                             GObject            *child)
 {
   g_return_if_fail (GLADE_IS_WIDGET_ADAPTOR (adaptor));
   g_return_if_fail (G_IS_OBJECT (container));
@@ -3524,7 +3563,7 @@ glade_widget_adaptor_remove (GladeWidgetAdaptor *adaptor,
  */
 GList *
 glade_widget_adaptor_get_children (GladeWidgetAdaptor *adaptor,
-                                   GObject *container)
+                                   GObject            *container)
 {
   g_return_val_if_fail (GLADE_IS_WIDGET_ADAPTOR (adaptor), NULL);
   g_return_val_if_fail (G_IS_OBJECT (container), NULL);
@@ -3544,8 +3583,8 @@ glade_widget_adaptor_get_children (GladeWidgetAdaptor *adaptor,
  */
 gboolean
 glade_widget_adaptor_has_child (GladeWidgetAdaptor *adaptor,
-                                GObject *container,
-                                GObject *child)
+                                GObject            *container,
+                                GObject            *child)
 {
   GList *list, *children = NULL;
   gboolean found = FALSE;
@@ -3577,10 +3616,10 @@ glade_widget_adaptor_has_child (GladeWidgetAdaptor *adaptor,
  */
 void
 glade_widget_adaptor_child_set_property (GladeWidgetAdaptor *adaptor,
-                                         GObject *container,
-                                         GObject *child,
-                                         const gchar *property_name,
-                                         const GValue *value)
+                                         GObject            *container,
+                                         GObject            *child,
+                                         const gchar        *property_name,
+                                         const GValue       *value)
 {
   g_return_if_fail (GLADE_IS_WIDGET_ADAPTOR (adaptor));
   g_return_if_fail (G_IS_OBJECT (container));
@@ -3612,10 +3651,10 @@ glade_widget_adaptor_child_set_property (GladeWidgetAdaptor *adaptor,
  */
 void
 glade_widget_adaptor_child_get_property (GladeWidgetAdaptor *adaptor,
-                                         GObject *container,
-                                         GObject *child,
-                                         const gchar *property_name,
-                                         GValue *value)
+                                         GObject            *container,
+                                         GObject            *child,
+                                         const gchar        *property_name,
+                                         GValue             *value)
 {
   g_return_if_fail (GLADE_IS_WIDGET_ADAPTOR (adaptor));
   g_return_if_fail (G_IS_OBJECT (container));
@@ -3650,10 +3689,10 @@ glade_widget_adaptor_child_get_property (GladeWidgetAdaptor *adaptor,
  */
 gboolean
 glade_widget_adaptor_child_verify_property (GladeWidgetAdaptor *adaptor,
-                                            GObject *container,
-                                            GObject *child,
-                                            const gchar *property_name,
-                                            const GValue *value)
+                                            GObject            *container,
+                                            GObject            *child,
+                                            const gchar        *property_name,
+                                            const GValue       *value)
 {
   g_return_val_if_fail (GLADE_IS_WIDGET_ADAPTOR (adaptor), FALSE);
   g_return_val_if_fail (G_IS_OBJECT (container), FALSE);
@@ -3685,9 +3724,9 @@ glade_widget_adaptor_child_verify_property (GladeWidgetAdaptor *adaptor,
  */
 void
 glade_widget_adaptor_replace_child (GladeWidgetAdaptor *adaptor,
-                                    GObject *container,
-                                    GObject *old_obj,
-                                    GObject *new_obj)
+                                    GObject            *container,
+                                    GObject            *old_obj,
+                                    GObject            *new_obj)
 {
   g_return_if_fail (GLADE_IS_WIDGET_ADAPTOR (adaptor));
   g_return_if_fail (G_IS_OBJECT (container));
@@ -3742,7 +3781,7 @@ glade_widget_adaptor_query (GladeWidgetAdaptor *adaptor)
 G_CONST_RETURN gchar *
 glade_widget_adaptor_get_packing_default (GladeWidgetAdaptor *child_adaptor,
                                           GladeWidgetAdaptor *container_adaptor,
-                                          const gchar *id)
+                                          const gchar        *id)
 {
   GladeChildPacking *packing = NULL;
   GList *l;
@@ -3885,10 +3924,10 @@ glade_widget_adaptor_action_add_real (GList       **list,
  */
 gboolean
 glade_widget_adaptor_action_add (GladeWidgetAdaptor *adaptor,
-                                 const gchar *action_path,
-                                 const gchar *label,
-                                 const gchar *stock,
-                                 gboolean important)
+                                 const gchar        *action_path,
+                                 const gchar        *label,
+                                 const gchar        *stock,
+                                 gboolean            important)
 {
   g_return_val_if_fail (GLADE_IS_WIDGET_ADAPTOR (adaptor), FALSE);
   g_return_val_if_fail (action_path != NULL, FALSE);
@@ -3913,10 +3952,10 @@ glade_widget_adaptor_action_add (GladeWidgetAdaptor *adaptor,
  */
 gboolean
 glade_widget_adaptor_pack_action_add (GladeWidgetAdaptor *adaptor,
-                                      const gchar *action_path,
-                                      const gchar *label,
-                                      const gchar *stock,
-                                      gboolean important)
+                                      const gchar        *action_path,
+                                      const gchar        *label,
+                                      const gchar        *stock,
+                                      gboolean            important)
 {
   g_return_val_if_fail (GLADE_IS_WIDGET_ADAPTOR (adaptor), FALSE);
   g_return_val_if_fail (action_path != NULL, FALSE);
@@ -3959,7 +3998,7 @@ glade_widget_adaptor_action_remove_real (GList **list,
  */
 gboolean
 glade_widget_adaptor_action_remove (GladeWidgetAdaptor *adaptor,
-                                    const gchar *action_path)
+                                    const gchar        *action_path)
 {
   g_return_val_if_fail (GLADE_IS_WIDGET_ADAPTOR (adaptor), FALSE);
   g_return_val_if_fail (action_path != NULL, FALSE);
@@ -3979,7 +4018,7 @@ glade_widget_adaptor_action_remove (GladeWidgetAdaptor *adaptor,
  */
 gboolean
 glade_widget_adaptor_pack_action_remove (GladeWidgetAdaptor *adaptor,
-                                         const gchar *action_path)
+                                         const gchar        *action_path)
 {
   g_return_val_if_fail (GLADE_IS_WIDGET_ADAPTOR (adaptor), FALSE);
   g_return_val_if_fail (action_path != NULL, FALSE);
@@ -4050,8 +4089,8 @@ glade_widget_adaptor_pack_actions_new (GladeWidgetAdaptor *adaptor)
  */
 void
 glade_widget_adaptor_action_activate (GladeWidgetAdaptor *adaptor,
-                                      GObject *object,
-                                      const gchar *action_path)
+                                      GObject            *object,
+                                      const gchar        *action_path)
 {
   g_return_if_fail (GLADE_IS_WIDGET_ADAPTOR (adaptor));
   g_return_if_fail (G_IS_OBJECT (object));
@@ -4071,9 +4110,9 @@ glade_widget_adaptor_action_activate (GladeWidgetAdaptor *adaptor,
  */
 void
 glade_widget_adaptor_child_action_activate (GladeWidgetAdaptor *adaptor,
-                                            GObject *container,
-                                            GObject *object,
-                                            const gchar *action_path)
+                                            GObject            *container,
+                                            GObject            *object,
+                                            const gchar        *action_path)
 {
   g_return_if_fail (GLADE_IS_WIDGET_ADAPTOR (adaptor));
   g_return_if_fail (G_IS_OBJECT (container));
@@ -4099,8 +4138,8 @@ glade_widget_adaptor_child_action_activate (GladeWidgetAdaptor *adaptor,
  */
 GtkWidget *
 glade_widget_adaptor_action_submenu (GladeWidgetAdaptor *adaptor,
-                                     GObject *object,
-                                     const gchar *action_path)
+                                     GObject            *object,
+                                     const gchar        *action_path)
 {
   g_return_val_if_fail (GLADE_IS_WIDGET_ADAPTOR (adaptor), NULL);
   g_return_val_if_fail (G_IS_OBJECT (object), NULL);
@@ -4131,8 +4170,8 @@ glade_widget_adaptor_action_submenu (GladeWidgetAdaptor *adaptor,
  */
 gboolean
 glade_widget_adaptor_depends (GladeWidgetAdaptor *adaptor,
-                              GladeWidget *widget,
-                              GladeWidget *another)
+                              GladeWidget        *widget,
+                              GladeWidget        *another)
 {
   return FALSE;
 }
@@ -4148,8 +4187,8 @@ glade_widget_adaptor_depends (GladeWidgetAdaptor *adaptor,
  */
 void
 glade_widget_adaptor_read_widget (GladeWidgetAdaptor *adaptor,
-                                  GladeWidget *widget,
-                                  GladeXmlNode *node)
+                                  GladeWidget        *widget,
+                                  GladeXmlNode       *node)
 {
   g_return_if_fail (GLADE_IS_WIDGET_ADAPTOR (adaptor));
   g_return_if_fail (GLADE_IS_WIDGET (widget));
@@ -4171,9 +4210,9 @@ glade_widget_adaptor_read_widget (GladeWidgetAdaptor *adaptor,
  */
 void
 glade_widget_adaptor_write_widget (GladeWidgetAdaptor *adaptor,
-                                   GladeWidget *widget,
-                                   GladeXmlContext *context,
-                                   GladeXmlNode *node)
+                                   GladeWidget        *widget,
+                                   GladeXmlContext    *context,
+                                   GladeXmlNode       *node)
 {
   g_return_if_fail (GLADE_IS_WIDGET_ADAPTOR (adaptor));
   g_return_if_fail (GLADE_IS_WIDGET (widget));
@@ -4196,9 +4235,9 @@ glade_widget_adaptor_write_widget (GladeWidgetAdaptor *adaptor,
  */
 void
 glade_widget_adaptor_write_widget_after (GladeWidgetAdaptor *adaptor,
-					 GladeWidget *widget,
-					 GladeXmlContext *context,
-					 GladeXmlNode *node)
+					 GladeWidget        *widget,
+					 GladeXmlContext    *context,
+					 GladeXmlNode       *node)
 {
   g_return_if_fail (GLADE_IS_WIDGET_ADAPTOR (adaptor));
   g_return_if_fail (GLADE_IS_WIDGET (widget));
@@ -4221,8 +4260,8 @@ glade_widget_adaptor_write_widget_after (GladeWidgetAdaptor *adaptor,
  */
 void
 glade_widget_adaptor_read_child (GladeWidgetAdaptor *adaptor,
-                                 GladeWidget *widget,
-                                 GladeXmlNode *node)
+                                 GladeWidget        *widget,
+                                 GladeXmlNode       *node)
 {
   g_return_if_fail (GLADE_IS_WIDGET_ADAPTOR (adaptor));
   g_return_if_fail (GLADE_IS_WIDGET (widget));
@@ -4245,9 +4284,9 @@ glade_widget_adaptor_read_child (GladeWidgetAdaptor *adaptor,
  */
 void
 glade_widget_adaptor_write_child (GladeWidgetAdaptor *adaptor,
-                                  GladeWidget *widget,
-                                  GladeXmlContext *context,
-                                  GladeXmlNode *node)
+                                  GladeWidget        *widget,
+                                  GladeXmlContext    *context,
+                                  GladeXmlNode       *node)
 {
   g_return_if_fail (GLADE_IS_WIDGET_ADAPTOR (adaptor));
   g_return_if_fail (GLADE_IS_WIDGET (widget));
@@ -4272,7 +4311,7 @@ glade_widget_adaptor_write_child (GladeWidgetAdaptor *adaptor,
 GladeEditorProperty *
 glade_widget_adaptor_create_eprop (GladeWidgetAdaptor *adaptor,
                                    GladePropertyClass *klass,
-                                   gboolean use_command)
+                                   gboolean            use_command)
 {
   GladeEditorProperty *eprop;
   g_return_val_if_fail (GLADE_IS_WIDGET_ADAPTOR (adaptor), NULL);
@@ -4304,9 +4343,9 @@ glade_widget_adaptor_create_eprop (GladeWidgetAdaptor *adaptor,
  */
 GladeEditorProperty *
 glade_widget_adaptor_create_eprop_by_name (GladeWidgetAdaptor *adaptor,
-                                           const gchar *property_id,
-                                           gboolean packing,
-                                           gboolean use_command)
+                                           const gchar        *property_id,
+                                           gboolean            packing,
+                                           gboolean            use_command)
 {
   GladePropertyClass *klass;
   g_return_val_if_fail (GLADE_IS_WIDGET_ADAPTOR (adaptor), NULL);
@@ -4339,7 +4378,7 @@ glade_widget_adaptor_create_eprop_by_name (GladeWidgetAdaptor *adaptor,
 gchar *
 glade_widget_adaptor_string_from_value (GladeWidgetAdaptor *adaptor,
                                         GladePropertyClass *klass,
-                                        const GValue *value)
+                                        const GValue       *value)
 {
   g_return_val_if_fail (GLADE_IS_WIDGET_ADAPTOR (adaptor), NULL);
   g_return_val_if_fail (GLADE_IS_PROPERTY_CLASS (klass), NULL);
@@ -4362,7 +4401,7 @@ glade_widget_adaptor_string_from_value (GladeWidgetAdaptor *adaptor,
  */
 GladeSignalClass *
 glade_widget_adaptor_get_signal_class (GladeWidgetAdaptor *adaptor,
-                                       const gchar *name)
+                                       const gchar        *name)
 {
   GList *list;
   GladeSignalClass *signal;

gladeui/glade-xml-utils.c

@@ -63,7 +63,7 @@ struct _GladeXmlContext
 
 
 static gchar *
-claim_string (xmlChar * string)
+claim_string (xmlChar *string)
 {
   gchar *ret;
   ret = g_strdup (CAST_BAD (string));
@@ -80,8 +80,7 @@ claim_string (xmlChar * string)
  * Sets the property @name in @node_in to @val
  */
 void
-glade_xml_set_value (GladeXmlNode * node_in, const gchar * name,
-                     const gchar * val)
+glade_xml_set_value (GladeXmlNode *node_in, const gchar *name, const gchar *val)
 {
   xmlNodePtr node = (xmlNodePtr) node_in;
   xmlChar *ret;
@@ -104,7 +103,7 @@ glade_xml_set_value (GladeXmlNode * node_in, const gchar * name,
  * Returns: A newly allocated string
  */
 gchar *
-glade_xml_get_content (GladeXmlNode * node_in)
+glade_xml_get_content (GladeXmlNode *node_in)
 {
   xmlNodePtr node = (xmlNodePtr) node_in;
   xmlChar *val = xmlNodeGetContent (node);
@@ -120,7 +119,7 @@ glade_xml_get_content (GladeXmlNode * node_in)
  * Sets the content of @node to @content.
  */
 void
-glade_xml_set_content (GladeXmlNode * node_in, const gchar * content)
+glade_xml_set_content (GladeXmlNode *node_in, const gchar *content)
 {
   xmlNodePtr node = (xmlNodePtr) node_in;
   xmlChar *content_encoded;
@@ -142,7 +141,7 @@ glade_xml_set_content (GladeXmlNode * node_in, const gchar * content)
  *
  */
 static gchar *
-glade_xml_get_value (xmlNodePtr node, const gchar * name)
+glade_xml_get_value (xmlNodePtr node, const gchar *name)
 {
   xmlNodePtr child;
   gchar *ret = NULL;
@@ -162,7 +161,7 @@ glade_xml_get_value (xmlNodePtr node, const gchar * name)
  * Returns: %TRUE if @node_in's name is equal to @name, %FALSE otherwise
  */
 gboolean
-glade_xml_node_verify_silent (GladeXmlNode * node_in, const gchar * name)
+glade_xml_node_verify_silent (GladeXmlNode *node_in, const gchar *name)
 {
   xmlNodePtr node = (xmlNodePtr) node_in;
 
@@ -184,7 +183,7 @@ glade_xml_node_verify_silent (GladeXmlNode * node_in, const gchar * name)
  * Returns: %TRUE if @node_in's name is equal to @name, %FALSE otherwise
  */
 gboolean
-glade_xml_node_verify (GladeXmlNode * node_in, const gchar * name)
+glade_xml_node_verify (GladeXmlNode *node_in, const gchar *name)
 {
   xmlNodePtr node = (xmlNodePtr) node_in;
 
@@ -210,7 +209,7 @@ glade_xml_node_verify (GladeXmlNode * node_in, const gchar * name)
  * Returns: %TRUE if the node is found, %FALSE otherwise
  */
 gboolean
-glade_xml_get_value_int (GladeXmlNode * node_in, const gchar * name, gint * val)
+glade_xml_get_value_int (GladeXmlNode *node_in, const gchar *name, gint *val)
 {
   xmlNodePtr node = (xmlNodePtr) node_in;
   gchar *value, *endptr = NULL;
@@ -245,8 +244,9 @@ glade_xml_get_value_int (GladeXmlNode * node_in, const gchar * name, gint * val)
  * Returns:
  **/
 gboolean
-glade_xml_get_value_int_required (GladeXmlNode * node, const gchar * name,
-                                  gint * val)
+glade_xml_get_value_int_required (GladeXmlNode *node,
+                                  const gchar  *name,
+                                  gint         *val)
 {
   gboolean ret;
 
@@ -264,14 +264,14 @@ glade_xml_get_value_int_required (GladeXmlNode * node, const gchar * name,
  * the content of a child.
  */
 gchar *
-glade_xml_get_value_string (GladeXmlNode * node_in, const gchar * name)
+glade_xml_get_value_string (GladeXmlNode *node_in, const gchar *name)
 {
   xmlNodePtr node = (xmlNodePtr) node_in;
   return glade_xml_get_value (node, name);
 }
 
 static gchar *
-glade_xml_get_property (xmlNodePtr node, const gchar * name)
+glade_xml_get_property (xmlNodePtr node, const gchar *name)
 {
   xmlChar *val;
 
@@ -284,8 +284,9 @@ glade_xml_get_property (xmlNodePtr node, const gchar * name)
 }
 
 static void
-glade_xml_set_property (xmlNodePtr node, const gchar * name,
-                        const gchar * value)
+glade_xml_set_property (xmlNodePtr   node,
+                        const gchar *name,
+                        const gchar *value)
 {
   if (value)
     xmlSetProp (node, BAD_CAST (name), BAD_CAST (value));
@@ -302,8 +303,9 @@ glade_xml_set_property (xmlNodePtr node, const gchar * name,
  * the content of a child.
  */
 gboolean
-glade_xml_get_boolean (GladeXmlNode * node_in, const gchar * name,
-                       gboolean _default)
+glade_xml_get_boolean (GladeXmlNode *node_in,
+                       const gchar  *name,
+                       gboolean      _default)
 {
   xmlNodePtr node = (xmlNodePtr) node_in;
   gchar *value;
@@ -338,8 +340,9 @@ glade_xml_get_boolean (GladeXmlNode * node_in, const gchar * name,
  * the content of a child.
  */
 gboolean
-glade_xml_get_property_boolean (GladeXmlNode * node_in,
-                                const gchar * name, gboolean _default)
+glade_xml_get_property_boolean (GladeXmlNode *node_in,
+                                const gchar  *name,
+                                gboolean      _default)
 {
   xmlNodePtr node = (xmlNodePtr) node_in;
   gchar *value;
@@ -370,8 +373,9 @@ glade_xml_get_property_boolean (GladeXmlNode * node_in,
 }
 
 gdouble
-glade_xml_get_property_double (GladeXmlNode * node_in,
-                               const gchar * name, gdouble _default)
+glade_xml_get_property_double (GladeXmlNode *node_in,
+                               const gchar  *name,
+                               gdouble       _default)
 {
   xmlNodePtr node = (xmlNodePtr) node_in;
   gdouble retval;
@@ -397,8 +401,9 @@ glade_xml_get_property_double (GladeXmlNode * node_in,
 }
 
 gint
-glade_xml_get_property_int (GladeXmlNode * node_in,
-                            const gchar * name, gint _default)
+glade_xml_get_property_int (GladeXmlNode *node_in,
+                            const gchar  *name,
+                            gint          _default)
 {
   xmlNodePtr node = (xmlNodePtr) node_in;
   gint retval;
@@ -415,8 +420,9 @@ glade_xml_get_property_int (GladeXmlNode * node_in,
 }
 
 void
-glade_xml_node_set_property_boolean (GladeXmlNode * node_in,
-                                     const gchar * name, gboolean value)
+glade_xml_node_set_property_boolean (GladeXmlNode *node_in,
+                                     const gchar  *name,
+                                     gboolean      value)
 {
   xmlNodePtr node = (xmlNodePtr) node_in;
 
@@ -434,8 +440,9 @@ glade_xml_node_set_property_boolean (GladeXmlNode * node_in,
 #undef GLADE_TAG_FALSE3
 
 gchar *
-glade_xml_get_value_string_required (GladeXmlNode * node_in,
-                                     const gchar * name, const gchar * xtra)
+glade_xml_get_value_string_required (GladeXmlNode *node_in,
+                                     const gchar  *name,
+                                     const gchar  *xtra)
 {
   xmlNodePtr node = (xmlNodePtr) node_in;
   gchar *value = glade_xml_get_value (node, name);
@@ -454,7 +461,7 @@ glade_xml_get_value_string_required (GladeXmlNode * node_in,
 }
 
 gchar *
-glade_xml_get_property_string (GladeXmlNode * node_in, const gchar * name)
+glade_xml_get_property_string (GladeXmlNode *node_in, const gchar *name)
 {
   xmlNodePtr node = (xmlNodePtr) node_in;
 
@@ -462,8 +469,9 @@ glade_xml_get_property_string (GladeXmlNode * node_in, const gchar * name)
 }
 
 void
-glade_xml_node_set_property_string (GladeXmlNode * node_in,
-                                    const gchar * name, const gchar * string)
+glade_xml_node_set_property_string (GladeXmlNode *node_in,
+                                    const gchar  *name,
+                                    const gchar  *string)
 {
   xmlNodePtr node = (xmlNodePtr) node_in;
 
@@ -471,8 +479,9 @@ glade_xml_node_set_property_string (GladeXmlNode * node_in,
 }
 
 gchar *
-glade_xml_get_property_string_required (GladeXmlNode * node_in,
-                                        const gchar * name, const gchar * xtra)
+glade_xml_get_property_string_required (GladeXmlNode *node_in,
+                                        const gchar  *name,
+                                        const gchar  *xtra)
 {
   xmlNodePtr node = (xmlNodePtr) node_in;
   gchar *value = glade_xml_get_property_string (node_in, name);
@@ -490,9 +499,10 @@ glade_xml_get_property_string_required (GladeXmlNode * node_in,
 }
 
 gboolean
-glade_xml_get_property_version (GladeXmlNode * node_in,
-                                const gchar * name,
-                                guint16 * major, guint16 * minor)
+glade_xml_get_property_version (GladeXmlNode *node_in,
+                                const gchar  *name,
+                                guint16      *major,
+                                guint16      * minor)
 {
   xmlNodePtr node = (xmlNodePtr) node_in;
   gchar *value = glade_xml_get_property_string (node_in, name);
@@ -522,8 +532,8 @@ glade_xml_get_property_version (GladeXmlNode * node_in,
 }
 
 GList *
-glade_xml_get_property_targetable_versions (GladeXmlNode * node_in,
-                                            const gchar * name)
+glade_xml_get_property_targetable_versions (GladeXmlNode *node_in,
+                                            const gchar  *name)
 {
   GladeTargetableVersion *version;
   GList *targetable = NULL;
@@ -571,7 +581,7 @@ glade_xml_get_property_targetable_versions (GladeXmlNode * node_in,
  * Search a child by name,
  */
 GladeXmlNode *
-glade_xml_search_child (GladeXmlNode * node_in, const gchar * name)
+glade_xml_search_child (GladeXmlNode *node_in, const gchar *name)
 {
   xmlNodePtr node;
   xmlNodePtr child;
@@ -601,7 +611,7 @@ glade_xml_search_child (GladeXmlNode * node_in, const gchar * name)
  * Return Value: 
  **/
 GladeXmlNode *
-glade_xml_search_child_required (GladeXmlNode * node, const gchar * name)
+glade_xml_search_child_required (GladeXmlNode *node, const gchar *name)
 {
   GladeXmlNode *child;
 
@@ -617,7 +627,7 @@ glade_xml_search_child_required (GladeXmlNode * node, const gchar * name)
 /* --------------------------- Parse Context ----------------------------*/
 
 static GladeXmlContext *
-glade_xml_context_new_real (GladeXmlDoc * doc, gboolean freedoc, xmlNsPtr ns)
+glade_xml_context_new_real (GladeXmlDoc *doc, gboolean freedoc, xmlNsPtr ns)
 {
   GladeXmlContext *context = g_new0 (GladeXmlContext, 1);
 
@@ -629,7 +639,7 @@ glade_xml_context_new_real (GladeXmlDoc * doc, gboolean freedoc, xmlNsPtr ns)
 }
 
 GladeXmlContext *
-glade_xml_context_new (GladeXmlDoc * doc, const gchar * name_space)
+glade_xml_context_new (GladeXmlDoc *doc, const gchar *name_space)
 {
   /* We are not using the namespace now */
   return glade_xml_context_new_real (doc, TRUE, NULL);
@@ -645,8 +655,9 @@ glade_xml_context_destroy (GladeXmlContext * context)
 }
 
 GladeXmlContext *
-glade_xml_context_new_from_path (const gchar * full_path,
-                                 const gchar * nspace, const gchar * root_name)
+glade_xml_context_new_from_path (const gchar *full_path,
+                                 const gchar *nspace,
+                                 const gchar *root_name)
 {
   GladeXmlContext *context;
   xmlDocPtr doc;
@@ -703,7 +714,7 @@ glade_xml_context_new_from_path (const gchar * full_path,
  * Similar to glade_xml_context_destroy but it also frees the document set in the context
  **/
 void
-glade_xml_context_free (GladeXmlContext * context)
+glade_xml_context_free (GladeXmlContext *context)
 {
   g_return_if_fail (context != NULL);
   if (context->doc)
@@ -714,7 +725,8 @@ glade_xml_context_free (GladeXmlContext * context)
 }
 
 void
-glade_xml_node_append_child (GladeXmlNode * node_in, GladeXmlNode * child_in)
+glade_xml_node_append_child (GladeXmlNode *node_in,
+                             GladeXmlNode *child_in)
 {
   xmlNodePtr node = (xmlNodePtr) node_in;
   xmlNodePtr child = (xmlNodePtr) child_in;
@@ -737,7 +749,7 @@ glade_xml_node_remove (GladeXmlNode * node_in)
 
 
 GladeXmlNode *
-glade_xml_node_new (GladeXmlContext * context, const gchar * name)
+glade_xml_node_new (GladeXmlContext *context, const gchar *name)
 {
   g_return_val_if_fail (context != NULL, NULL);
   g_return_val_if_fail (name != NULL, NULL);
@@ -747,7 +759,7 @@ glade_xml_node_new (GladeXmlContext * context, const gchar * name)
 }
 
 GladeXmlNode *
-glade_xml_node_new_comment (GladeXmlContext * context, const gchar * comment)
+glade_xml_node_new_comment (GladeXmlContext *context, const gchar *comment)
 {
   g_return_val_if_fail (context != NULL, NULL);
   g_return_val_if_fail (comment != NULL, NULL);
@@ -769,19 +781,19 @@ glade_xml_node_copy (GladeXmlNode *node)
 }
 
 void
-glade_xml_node_delete (GladeXmlNode * node)
+glade_xml_node_delete (GladeXmlNode *node)
 {
   xmlFreeNode ((xmlNodePtr) node);
 }
 
 GladeXmlDoc *
-glade_xml_context_get_doc (GladeXmlContext * context)
+glade_xml_context_get_doc (GladeXmlContext *context)
 {
   return context->doc;
 }
 
 gchar *
-glade_xml_dump_from_context (GladeXmlContext * context)
+glade_xml_dump_from_context (GladeXmlContext *context)
 {
   GladeXmlDoc *doc;
   xmlChar *string = NULL;
@@ -797,7 +809,7 @@ glade_xml_dump_from_context (GladeXmlContext * context)
 }
 
 gboolean
-glade_xml_node_is_comment (GladeXmlNode * node_in)
+glade_xml_node_is_comment (GladeXmlNode *node_in)
 {
   xmlNodePtr node = (xmlNodePtr) node_in;
   return (node) ? node->type == XML_COMMENT_NODE : FALSE;
@@ -824,7 +836,7 @@ glade_xml_node_get_children (GladeXmlNode * node_in)
 }
 
 GladeXmlNode *
-glade_xml_node_get_parent (GladeXmlNode * node_in)
+glade_xml_node_get_parent (GladeXmlNode *node_in)
 {
   xmlNodePtr node = (xmlNodePtr) node_in;
 
@@ -833,7 +845,7 @@ glade_xml_node_get_parent (GladeXmlNode * node_in)
 
 
 GladeXmlNode *
-glade_xml_node_get_children_with_comments (GladeXmlNode * node_in)
+glade_xml_node_get_children_with_comments (GladeXmlNode *node_in)
 {
   xmlNodePtr node = (xmlNodePtr) node_in;
 
@@ -841,7 +853,7 @@ glade_xml_node_get_children_with_comments (GladeXmlNode * node_in)
 }
 
 GladeXmlNode *
-glade_xml_node_next (GladeXmlNode * node_in)
+glade_xml_node_next (GladeXmlNode *node_in)
 {
   xmlNodePtr node = (xmlNodePtr) node_in;
 
@@ -853,7 +865,7 @@ glade_xml_node_next (GladeXmlNode * node_in)
 }
 
 GladeXmlNode *
-glade_xml_node_next_with_comments (GladeXmlNode * node_in)
+glade_xml_node_next_with_comments (GladeXmlNode *node_in)
 {
   xmlNodePtr node = (xmlNodePtr) node_in;
 
@@ -861,7 +873,7 @@ glade_xml_node_next_with_comments (GladeXmlNode * node_in)
 }
 
 GladeXmlNode *
-glade_xml_node_prev_with_comments (GladeXmlNode * node_in)
+glade_xml_node_prev_with_comments (GladeXmlNode *node_in)
 {
   xmlNodePtr node = (xmlNodePtr) node_in;
 
@@ -869,7 +881,7 @@ glade_xml_node_prev_with_comments (GladeXmlNode * node_in)
 }
 
 const gchar *
-glade_xml_node_get_name (GladeXmlNode * node_in)
+glade_xml_node_get_name (GladeXmlNode *node_in)
 {
   xmlNodePtr node = (xmlNodePtr) node_in;
 
@@ -885,7 +897,7 @@ glade_xml_doc_new (void)
 }
 
 void
-glade_xml_doc_set_root (GladeXmlDoc * doc_in, GladeXmlNode * node_in)
+glade_xml_doc_set_root (GladeXmlDoc *doc_in, GladeXmlNode *node_in)
 {
   xmlNodePtr node = (xmlNodePtr) node_in;
   xmlDocPtr doc = (xmlDocPtr) doc_in;
@@ -894,7 +906,7 @@ glade_xml_doc_set_root (GladeXmlDoc * doc_in, GladeXmlNode * node_in)
 }
 
 gint
-glade_xml_doc_save (GladeXmlDoc * doc_in, const gchar * full_path)
+glade_xml_doc_save (GladeXmlDoc *doc_in, const gchar *full_path)
 {
   xmlDocPtr doc = (xmlDocPtr) doc_in;
 
@@ -903,7 +915,7 @@ glade_xml_doc_save (GladeXmlDoc * doc_in, const gchar * full_path)
 }
 
 void
-glade_xml_doc_free (GladeXmlDoc * doc_in)
+glade_xml_doc_free (GladeXmlDoc *doc_in)
 {
   xmlDocPtr doc = (xmlDocPtr) doc_in;
 
@@ -917,7 +929,7 @@ glade_xml_doc_free (GladeXmlDoc * doc_in)
  * Returns: the #GladeXmlNode that is the document root of @doc
  */
 GladeXmlNode *
-glade_xml_doc_get_root (GladeXmlDoc * doc)
+glade_xml_doc_get_root (GladeXmlDoc *doc)
 {
   xmlNodePtr node;
 
@@ -927,9 +939,10 @@ glade_xml_doc_get_root (GladeXmlDoc * doc)
 }
 
 gboolean
-glade_xml_load_sym_from_node (GladeXmlNode * node_in,
-                              GModule * module,
-                              gchar * tagname, gpointer * sym_location)
+glade_xml_load_sym_from_node (GladeXmlNode *node_in,
+                              GModule      *module,
+                              gchar        *tagname,
+                              gpointer     *sym_location)
 {
   static GModule *self = NULL;
   gboolean retval = FALSE;

plugins/gtk+/glade-about-dialog-editor.c

@@ -25,7 +25,7 @@
 
 #include "glade-about-dialog-editor.h"
 
-static void glade_about_dialog_editor_editable_init (GladeEditableIface * iface);
+static void glade_about_dialog_editor_editable_init (GladeEditableIface *iface);
 
 /* Callbacks */
 static void license_type_pre_commit     (GladePropertyShell     *shell,
@@ -45,6 +45,8 @@ struct _GladeAboutDialogEditorPrivate
   GtkWidget *license_label;
   GtkWidget *license_editor;
   GtkWidget *wrap_license_editor;
+  GtkWidget *logo_file_editor;
+  GtkWidget *logo_icon_editor;
 
   GtkWidget *logo_file_radio;
   GtkWidget *logo_icon_radio;
@@ -67,6 +69,8 @@ glade_about_dialog_editor_class_init (GladeAboutDialogEditorClass * klass)
   gtk_widget_class_bind_template_child_private (widget_class, GladeAboutDialogEditor, license_label);
   gtk_widget_class_bind_template_child_private (widget_class, GladeAboutDialogEditor, license_editor);
   gtk_widget_class_bind_template_child_private (widget_class, GladeAboutDialogEditor, wrap_license_editor);
+  gtk_widget_class_bind_template_child_private (widget_class, GladeAboutDialogEditor, logo_file_editor);
+  gtk_widget_class_bind_template_child_private (widget_class, GladeAboutDialogEditor, logo_icon_editor);
   gtk_widget_class_bind_template_child_private (widget_class, GladeAboutDialogEditor, logo_file_radio);
   gtk_widget_class_bind_template_child_private (widget_class, GladeAboutDialogEditor, logo_icon_radio);
 
@@ -77,7 +81,7 @@ glade_about_dialog_editor_class_init (GladeAboutDialogEditorClass * klass)
 }
 
 static void
-glade_about_dialog_editor_init (GladeAboutDialogEditor * self)
+glade_about_dialog_editor_init (GladeAboutDialogEditor *self)
 {
   self->priv = glade_about_dialog_editor_get_instance_private (self);
 
@@ -85,7 +89,14 @@ glade_about_dialog_editor_init (GladeAboutDialogEditor * self)
 }
 
 static void
-glade_about_dialog_editor_load (GladeEditable * editable, GladeWidget * widget)
+glade_eprop_disable_check (GtkWidget *child, gpointer data)
+{
+  if (GLADE_IS_EDITOR_PROPERTY (child))
+    g_object_set (child, "disable-check", TRUE, NULL);
+}
+
+static void
+glade_about_dialog_editor_load (GladeEditable *editable, GladeWidget *widget)
 {
   GladeAboutDialogEditor *dialog_editor = GLADE_ABOUT_DIALOG_EDITOR (editable);
   GladeAboutDialogEditorPrivate *priv = dialog_editor->priv;
@@ -110,15 +121,21 @@ glade_about_dialog_editor_load (GladeEditable * editable, GladeWidget * widget)
       /* Set the radio button state to our virtual property */
       glade_widget_property_get (widget, "glade-logo-as-file", &as_file);
 
+      gtk_container_forall (GTK_CONTAINER (priv->logo_file_editor), glade_eprop_disable_check, NULL);
+      gtk_container_forall (GTK_CONTAINER (priv->logo_icon_editor), glade_eprop_disable_check, NULL);
+      
+      glade_widget_property_set_enabled (widget, "logo-icon-name", !as_file);
+      glade_widget_property_set_enabled (widget, "logo", as_file);
+      
       if (as_file)
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->logo_file_radio), TRUE);
+        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->logo_file_radio), TRUE);
       else
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->logo_icon_radio), TRUE);
+        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->logo_icon_radio), TRUE);
     }
 }
 
 static void
-glade_about_dialog_editor_editable_init (GladeEditableIface * iface)
+glade_about_dialog_editor_editable_init (GladeEditableIface *iface)
 {
   parent_editable_iface = g_type_interface_peek_parent (iface);
 
@@ -159,30 +176,23 @@ license_type_post_commit (GladePropertyShell     *shell,
 }
 
 static void
-logo_icon_toggled (GtkWidget              *widget,
-		   GladeAboutDialogEditor *editor)
+glade_about_dialog_editor_set_logo_as_file (GladeAboutDialogEditor *editor,
+                                            gboolean               logo_as_file)
 {
-  GladeAboutDialogEditorPrivate *priv = editor->priv;
   GladeWidget   *gwidget = glade_editable_loaded_widget (GLADE_EDITABLE (editor));
   GladeProperty *property;
 
   if (glade_editable_loading (GLADE_EDITABLE (editor)) || !gwidget)
     return;
 
-  if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->logo_icon_radio)))
-    return;
-
   glade_editable_block (GLADE_EDITABLE (editor));
 
-  glade_command_push_group (_("Setting %s to use a logo icon"),
+  glade_command_push_group (logo_as_file ? _("Setting %s to use logo file") :
+                              _("Setting %s to use a logo icon"),
                             glade_widget_get_name (gwidget));
 
-  property = glade_widget_get_property (gwidget, "logo-icon-name");
-  glade_command_set_property (property, NULL);
-  property = glade_widget_get_property (gwidget, "logo");
-  glade_command_set_property (property, NULL);
   property = glade_widget_get_property (gwidget, "glade-logo-as-file");
-  glade_command_set_property (property, FALSE);
+  glade_command_set_property (property, logo_as_file);
 
   glade_command_pop_group ();
 
@@ -193,37 +203,21 @@ logo_icon_toggled (GtkWidget              *widget,
 }
 
 static void
-logo_file_toggled (GtkWidget              *widget,
-		   GladeAboutDialogEditor *editor)
+logo_icon_toggled (GtkWidget *widget, GladeAboutDialogEditor *editor)
 {
-  GladeAboutDialogEditorPrivate *priv = editor->priv;
-  GladeWidget   *gwidget = glade_editable_loaded_widget (GLADE_EDITABLE (editor));
-  GladeProperty *property;
-
-  if (glade_editable_loading (GLADE_EDITABLE (editor)) || !gwidget)
+  if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
     return;
 
-  if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->logo_file_radio)))
+  glade_about_dialog_editor_set_logo_as_file (editor, FALSE);
+}
+
+static void
+logo_file_toggled (GtkWidget *widget, GladeAboutDialogEditor *editor)
+{
+  if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
     return;
 
-  glade_editable_block (GLADE_EDITABLE (editor));
-
-  glade_command_push_group (_("Setting %s to use logo file"),
-                            glade_widget_get_name (gwidget));
-
-  property = glade_widget_get_property (gwidget, "logo-icon-name");
-  glade_command_set_property (property, NULL);
-  property = glade_widget_get_property (gwidget, "logo");
-  glade_command_set_property (property, NULL);
-  property = glade_widget_get_property (gwidget, "glade-logo-as-file");
-  glade_command_set_property (property, TRUE);
-
-  glade_command_pop_group ();
-
-  glade_editable_unblock (GLADE_EDITABLE (editor));
-
-  /* reload buttons and sensitivity and stuff... */
-  glade_editable_load (GLADE_EDITABLE (editor), gwidget);
+  glade_about_dialog_editor_set_logo_as_file (editor, TRUE);
 }
 
 GtkWidget *

plugins/gtk+/glade-attributes.c

@@ -207,6 +207,7 @@ static gboolean
 append_empty_row (GtkListStore *store, PangoAttrType type)
 {
   const gchar *name = NULL;
+  guint spin_digits = 0;
   GtkListStore *model = get_enum_model_for_combo (type);
   GtkTreeIter iter;
   AttrEditType edit_type = EDIT_INVALID;
@@ -293,6 +294,7 @@ append_empty_row (GtkListStore *store, PangoAttrType type)
       case PANGO_ATTR_SCALE:
         edit_type = EDIT_SPIN;
         name = C_ ("textattr", "Scale");
+        spin_digits = 3;
         break;
 
       case PANGO_ATTR_FONT_DESC:
@@ -327,6 +329,7 @@ append_empty_row (GtkListStore *store, PangoAttrType type)
                           COLUMN_TEXT_STYLE, PANGO_STYLE_ITALIC,
                           COLUMN_TEXT_FG, "Grey",
                           COLUMN_COMBO_MODEL, model,
+                          COLUMN_SPIN_DIGITS, spin_digits,
                           ACTIVATE_COLUMN_FROM_TYPE (edit_type), TRUE, -1);
       return TRUE;
     }

plugins/gtk+/glade-fixed.c

@@ -92,9 +92,10 @@ typedef struct
 #define GRAB_BORDER_WIDTH  7
 #define GRAB_CORNER_WIDTH  7
 
-static GObjectClass *parent_class;
 static guint glade_fixed_signals[FIXED_SIGNALS];
 
+G_DEFINE_TYPE (GladeFixed, glade_fixed, GLADE_TYPE_WIDGET);
+
 /* From gtkmain.c */
 static gboolean
 glade_fixed_boolean_handled_accumulator (GSignalInvocationHint * ihint,
@@ -857,7 +858,7 @@ glade_fixed_add_child_impl (GladeWidget *gwidget_fixed,
 			     &fixed->mouse_x, &fixed->mouse_y);
 
   /* Chain up for the basic parenting */
-  GLADE_WIDGET_CLASS (parent_class)->add_child
+  GLADE_WIDGET_CLASS (glade_fixed_parent_class)->add_child
       (GLADE_WIDGET (fixed), child, at_mouse);
 
   /* We only operate on widgets here */
@@ -912,7 +913,7 @@ glade_fixed_remove_child_impl (GladeWidget *fixed, GladeWidget *child)
   glade_fixed_disconnect_child (GLADE_FIXED (fixed), child);
 
   /* Chain up for the basic unparenting */
-  GLADE_WIDGET_CLASS (parent_class)->remove_child (GLADE_WIDGET (fixed), child);
+  GLADE_WIDGET_CLASS (glade_fixed_parent_class)->remove_child (GLADE_WIDGET (fixed), child);
 }
 
 static void
@@ -927,7 +928,7 @@ glade_fixed_replace_child_impl (GladeWidget *fixed,
     glade_fixed_disconnect_child (GLADE_FIXED (fixed), gold_widget);
 
   /* Chain up for the basic reparenting */
-  GLADE_WIDGET_CLASS (parent_class)->replace_child
+  GLADE_WIDGET_CLASS (glade_fixed_parent_class)->replace_child
       (GLADE_WIDGET (fixed), old_object, new_object);
 
   if (gnew_widget)
@@ -952,7 +953,7 @@ glade_fixed_event (GladeWidget *gwidget_fixed, GdkEvent *event)
 
   /* If the GladeWidget used this event... let it slide.
    */
-  if (GLADE_WIDGET_CLASS (parent_class)->event (gwidget_fixed, event))
+  if (GLADE_WIDGET_CLASS (glade_fixed_parent_class)->event (gwidget_fixed, event))
     return TRUE;
 
   if ((device = gdk_event_get_device (event)))
@@ -968,6 +969,10 @@ glade_fixed_event (GladeWidget *gwidget_fixed, GdkEvent *event)
         }
     }
 
+  /* If the container uses placeholder adding widget is already taken care of */
+  if (GWA_USE_PLACEHOLDERS (glade_widget_get_adaptor (gwidget_fixed)))
+    return FALSE;
+  
   switch (event->type)
     {
       case GDK_BUTTON_PRESS:   /* add widget */
@@ -1025,7 +1030,7 @@ glade_fixed_finalize (GObject *object)
   g_free (fixed->width_prop);
   g_free (fixed->height_prop);
 
-  G_OBJECT_CLASS (parent_class)->finalize (object);
+  G_OBJECT_CLASS (glade_fixed_parent_class)->finalize (object);
 }
 
 static void
@@ -1111,8 +1116,6 @@ glade_fixed_class_init (GladeFixedClass *fixed_class)
   GObjectClass *gobject_class = G_OBJECT_CLASS (fixed_class);
   GladeWidgetClass *gwidget_class = GLADE_WIDGET_CLASS (fixed_class);
 
-  parent_class = G_OBJECT_CLASS (g_type_class_peek_parent (gobject_class));
-
   gobject_class->finalize = glade_fixed_finalize;
   gobject_class->set_property = glade_fixed_set_property;
   gobject_class->get_property = glade_fixed_get_property;
@@ -1230,31 +1233,6 @@ glade_fixed_class_init (GladeFixedClass *fixed_class)
                                       API
 *******************************************************************************/
 
-GType
-glade_fixed_get_type (void)
-{
-  static GType fixed_type = 0;
-
-  if (!fixed_type)
-    {
-      static const GTypeInfo fixed_info = {
-        sizeof (GladeFixedClass),
-        (GBaseInitFunc) NULL,
-        (GBaseFinalizeFunc) NULL,
-        (GClassInitFunc) glade_fixed_class_init,
-        (GClassFinalizeFunc) NULL,
-        NULL,                   /* class_data */
-        sizeof (GladeFixed),
-        0,                      /* n_preallocs */
-        (GInstanceInitFunc) glade_fixed_init,
-      };
-      fixed_type =
-          g_type_register_static (GLADE_TYPE_WIDGET,
-                                  "GladeFixed", &fixed_info, 0);
-    }
-  return fixed_type;
-}
-
 /* This is called from the catalog for a few widgets */
 GladeWidget *
 glade_gtk_create_fixed_widget (GladeWidgetAdaptor * adaptor,

plugins/gtk+/glade-gtk-about-dialog.c

@@ -27,9 +27,51 @@
 
 #include "glade-gtk.h"
 
+GObject *
+glade_gtk_about_dialog_construct_object (GladeWidgetAdaptor *adaptor,
+                                         guint               n_parameters,
+                                         GParameter         *parameters)
+{
+  GParameter *new_params = g_new0 (GParameter, n_parameters + 1);
+  gboolean use_header_bar_set = FALSE;
+  GObject *retval;
+  gint i;
+
+  /* Here we need to force use-header-bar to FALSE in the runtime because
+   * GtkAboutDialog set it to TRUE in its contructor which then triggers a
+   * warning when glade tries to add placeholders in the action area
+   */
+  for (i = 0; i < n_parameters; i++)
+    {
+      new_params[i] = parameters[i];
+
+      if (!g_strcmp0 (new_params[i].name, "use-header-bar"))
+        {
+          /* force the value to 0 */
+          g_value_set_int (&new_params[i].value, 0);
+          use_header_bar_set = TRUE;
+        }
+    }
+
+  if (!use_header_bar_set)
+    {
+      GParameter *use_header = &new_params[n_parameters++];
+
+      /* append value if it was not part of the parameters */
+      use_header->name = "use-header-bar";
+      g_value_init (&use_header->value, G_TYPE_INT);
+      g_value_set_int (&use_header->value, 0);
+    }
+
+  retval = GWA_GET_CLASS (GTK_TYPE_DIALOG)->construct_object (adaptor, n_parameters, new_params);
+  g_free (new_params);
+  return retval;
+}
+
 void
-glade_gtk_about_dialog_read_widget (GladeWidgetAdaptor * adaptor,
-				    GladeWidget * widget, GladeXmlNode * node)
+glade_gtk_about_dialog_read_widget (GladeWidgetAdaptor *adaptor,
+				    GladeWidget        *widget,
+                                    GladeXmlNode       *node)
 {
   if (!(glade_xml_node_verify_silent (node, GLADE_XML_TAG_WIDGET) ||
 	glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE)))
@@ -46,21 +88,23 @@ glade_gtk_about_dialog_read_widget (GladeWidgetAdaptor * adaptor,
 }
 
 void
-glade_gtk_about_dialog_set_property (GladeWidgetAdaptor * adaptor,
-				     GObject * object,
-				     const gchar * id, const GValue * value)
+glade_gtk_about_dialog_set_property (GladeWidgetAdaptor *adaptor,
+				     GObject            *object,
+				     const gchar        *id,
+                                     const GValue       *value)
 {
   if (!strcmp (id, "glade-logo-as-file"))
     {
       GladeWidget *gwidget = glade_widget_get_from_gobject (object);
+      GladeProperty *logo = glade_widget_get_property (gwidget, "logo");
+      GladeProperty *icon = glade_widget_get_property (gwidget, "logo-icon-name");
+      gboolean as_file = g_value_get_boolean (value);
 
-      glade_widget_property_set_sensitive (gwidget, "logo", FALSE, NOT_SELECTED_MSG);
-      glade_widget_property_set_sensitive (gwidget, "logo-icon-name", FALSE, NOT_SELECTED_MSG);
+      glade_property_set_sensitive (icon, !as_file, as_file ? NOT_SELECTED_MSG : NULL);
+      glade_property_set_enabled (icon, !as_file);
 
-      if (g_value_get_boolean (value))
-	glade_widget_property_set_sensitive (gwidget, "logo", TRUE, NULL);
-      else
-	glade_widget_property_set_sensitive (gwidget, "logo-icon-name", TRUE, NULL);
+      glade_property_set_sensitive (logo, as_file, as_file ? NULL : NOT_SELECTED_MSG);
+      glade_property_set_enabled (logo, as_file);
     }
   else
     GWA_GET_CLASS (GTK_TYPE_DIALOG)->set_property (adaptor, object, id, value);

plugins/gtk+/glade-gtk-label.c

@@ -399,7 +399,7 @@ glade_gtk_label_read_widget (GladeWidgetAdaptor * adaptor,
     glade_widget_property_set (widget, "label-wrap-mode",
                                GLADE_LABEL_WRAP_FREE);
 
-  if (glade_widget_property_original_default (widget, "use-markup"))
+  if (glade_widget_property_original_default (widget, "use-underline"))
     glade_widget_property_set_sensitive (widget, "mnemonic-widget",
                                          FALSE, MNEMONIC_INSENSITIVE_MSG);
 

plugins/gtk+/glade-gtk-message-dialog.c

@@ -67,7 +67,7 @@ glade_gtk_message_dialog_image_determine_action (GtkMessageDialog * dialog,
   *image = g_value_get_object (value);
 
   if (*image == NULL)
-    if (glade_widget_get_from_gobject (dialog_image))
+    if (dialog_image && glade_widget_get_from_gobject (dialog_image))
       return MD_IMAGE_ACTION_RESET;
     else
       return MD_IMAGE_ACTION_INVALID;

plugins/gtk+/glade-scale-editor.c

@@ -33,29 +33,23 @@ struct _GladeScaleEditorPrivate
   GtkWidget *embed;
 };
 
-G_DEFINE_TYPE (GladeScaleEditor, glade_scale_editor, GLADE_TYPE_EDITOR_SKELETON)
+G_DEFINE_TYPE_WITH_PRIVATE (GladeScaleEditor, glade_scale_editor, GLADE_TYPE_EDITOR_SKELETON)
 
 static void
 glade_scale_editor_class_init (GladeScaleEditorClass * klass)
 {
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 
   widget_class->grab_focus = glade_scale_editor_grab_focus;
 
   gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/gladegtk/glade-scale-editor.ui");
-  gtk_widget_class_bind_template_child_private (widget_class, GladeScaleEditor, embed);
-
-  g_type_class_add_private (object_class, sizeof (GladeScaleEditorPrivate));  
+  gtk_widget_class_bind_template_child_private (widget_class, GladeScaleEditor, embed); 
 }
 
 static void
 glade_scale_editor_init (GladeScaleEditor * self)
 {
-  self->priv = 
-    G_TYPE_INSTANCE_GET_PRIVATE (self,
-				 GLADE_TYPE_SCALE_EDITOR,
-				 GladeScaleEditorPrivate);
+  self->priv = glade_scale_editor_get_instance_private (self);
 
   gtk_widget_init_template (GTK_WIDGET (self));
 }

plugins/gtk+/gtk+.xml.in

@@ -1,9 +1,9 @@
 <glade-catalog name="gtk+"
-	       version="3.10"
-	       targetable="3.8,3.6,3.4,3.2,3.0"
+	       version="3.12"
+	       targetable="3.10,3.8,3.6,3.4,3.2,3.0"
 	       icon-prefix="gtk"
 	       library="gladegtk"
-	       domain="glade3"
+	       domain="glade"
 	       book="gtk3">
   <glade-widget-classes>
     
@@ -2147,6 +2147,8 @@
           <property id="default-width"  default="320" optional="True" optional-default="False"/>
           <property id="default-height" default="260" optional="True" optional-default="False"/>
           <property id="type-hint" default="GDK_WINDOW_TYPE_HINT_DIALOG" save-always="True"/>
+          <!-- We disabled this property until Glade supports GtkHeaderBar editing -->
+          <property id="use-header-bar" since="3.12" disabled="True"/>
         </properties>
         
       </glade-widget-class>
@@ -2828,6 +2830,7 @@
       
       <glade-widget-class name="GtkAboutDialog" generic-name="aboutdialog" _title="About Dialog">
         
+        <construct-object-function>glade_gtk_about_dialog_construct_object</construct-object-function>
         <read-widget-function>glade_gtk_about_dialog_read_widget</read-widget-function>
         <set-property-function>glade_gtk_about_dialog_set_property</set-property-function>
         
@@ -2836,8 +2839,8 @@
           <property id="version" custom-layout="True"/>
           <property id="license" translatable="True" multiline="True" custom-layout="True"/>
           <property id="wrap-license" custom-layout="True"/>
-          <property id="logo-icon-name" themed-icon="True" custom-layout="True"/>
-          <property id="logo" custom-layout="True"/>
+          <property id="logo-icon-name" themed-icon="True" custom-layout="True" optional="True"/>
+          <property id="logo" custom-layout="True" optional="True"/>
           <property id="website" custom-layout="True"/>
           <property id="website-label" translatable="True" multiline="True" custom-layout="True"/>
           <property id="authors" custom-layout="True"/>

plugins/gtk+/gtkunixprint.xml.in

@@ -2,7 +2,7 @@
 	       library="gladegtk"
 	       icon-prefix="gtk"
 	       depends="gtk+"
-	       domain="glade3"
+	       domain="glade"
 	       book="gtk">
 
   <glade-widget-classes>

po/cs.po

@@ -10,11 +10,11 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: glade master\n"
+"Project-Id-Version: glade glade-3.18\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=glade&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-03-14 06:45+0000\n"
-"PO-Revision-Date: 2014-03-14 10:51+0100\n"
+"POT-Creation-Date: 2014-03-31 06:00+0000\n"
+"PO-Revision-Date: 2014-03-31 10:42+0200\n"
 "Last-Translator: Marek Černocký <marek@manet.cz>\n"
 "Language-Team: Czech <gnome-cs-list@gnome.org>\n"
 "Language: cs\n"
@@ -82,190 +82,190 @@ msgstr ""
 msgid "[Read Only]"
 msgstr "[Pouze pro čtení]"
 
-#: ../src/glade-window.c:322
+#: ../src/glade-window.c:323
 msgid "User Interface Designer"
 msgstr "Návrhář uživatelského rozhraní"
 
 #. translators: referring to the action of activating a file named '%s'.
 #. *              we also indicate to users that the file may be read-only with
 #. *              the second '%s'
-#: ../src/glade-window.c:523
+#: ../src/glade-window.c:524
 #, c-format
 msgid "Activate '%s' %s"
 msgstr "Aktivovat „%s“ %s"
 
 #. translators: referring to the action of activating a file named '%s'
 #. FIXME add hint for translators
-#: ../src/glade-window.c:529 ../src/glade-window.c:537
+#: ../src/glade-window.c:530 ../src/glade-window.c:538
 #, c-format
 msgid "Activate '%s'"
 msgstr "Aktivovat „%s“"
 
 #. Name
-#: ../src/glade-window.c:585 ../src/glade-registration.glade.h:4
+#: ../src/glade-window.c:586 ../src/glade-registration.glade.h:4
 #: ../gladeui/glade-base-editor.c:2030
 #: ../gladeui/glade-project-properties.ui.h:12
 #: ../plugins/gtk+/glade-about-dialog-editor.ui.h:2
 msgid "Name:"
 msgstr "Název:"
 
-#: ../src/glade-window.c:588
+#: ../src/glade-window.c:589
 msgid "Requires:"
 msgstr "Vyžaduje:"
 
-#: ../src/glade-window.c:647
+#: ../src/glade-window.c:648
 msgid "_Undo"
 msgstr "_Zpět"
 
-#: ../src/glade-window.c:650
+#: ../src/glade-window.c:651
 #, c-format
 msgid "Undo: %s"
 msgstr "Zpět: %s"
 
-#: ../src/glade-window.c:651 ../src/glade-window.c:662
+#: ../src/glade-window.c:652 ../src/glade-window.c:663
 msgid "the last action"
 msgstr "poslední akce"
 
-#: ../src/glade-window.c:658
+#: ../src/glade-window.c:659
 msgid "_Redo"
 msgstr "Zn_ovu"
 
-#: ../src/glade-window.c:661
+#: ../src/glade-window.c:662
 #, c-format
 msgid "Redo: %s"
 msgstr "Znovu: %s"
 
-#: ../src/glade-window.c:693
+#: ../src/glade-window.c:694
 #, c-format
 msgid "Autosaving '%s'"
 msgstr "Automaticky se ukládá „%s“"
 
-#: ../src/glade-window.c:698
+#: ../src/glade-window.c:699
 #, c-format
 msgid "Error autosaving '%s'"
 msgstr "Chyba automatického ukládání „%s“"
 
-#: ../src/glade-window.c:1117
+#: ../src/glade-window.c:1118
 msgid "Open…"
 msgstr "Otevřít…"
 
-#: ../src/glade-window.c:1151
+#: ../src/glade-window.c:1152
 #, c-format
 msgid "Project %s is still loading."
 msgstr "Projekt „%s“ se doposud načítá."
 
-#: ../src/glade-window.c:1170
+#: ../src/glade-window.c:1171
 msgid "Failed to backup existing file, continue saving?"
 msgstr "Selhalo zazálohování stávajícího souboru. Pokračovat v ukládání?"
 
-#: ../src/glade-window.c:1192
+#: ../src/glade-window.c:1193
 #, c-format
 msgid "Failed to save %s: %s"
 msgstr "Nezdařilo se uložit %s: %s"
 
-#: ../src/glade-window.c:1231
+#: ../src/glade-window.c:1232
 #, c-format
 msgid "The file %s has been modified since reading it"
 msgstr "Od svého načtení se soubor %s změnil"
 
-#: ../src/glade-window.c:1235
+#: ../src/glade-window.c:1236
 msgid "If you save it, all the external changes could be lost. Save it anyway?"
 msgstr ""
 "Pokud jej uložíte, všechny externí změny budou přepsány. Přesto uložit?"
 
-#: ../src/glade-window.c:1240
+#: ../src/glade-window.c:1241
 msgid "_Save Anyway"
 msgstr "Pře_sto uložit"
 
-#: ../src/glade-window.c:1248
+#: ../src/glade-window.c:1249
 msgid "_Don't Save"
 msgstr "Neuklá_dat"
 
-#: ../src/glade-window.c:1282
+#: ../src/glade-window.c:1283
 #, c-format
 msgid "Project '%s' saved"
 msgstr "Projekt „%s“ byl uložen"
 
-#: ../src/glade-window.c:1313
+#: ../src/glade-window.c:1314
 msgid "Save As…"
 msgstr "Uložit jako…"
 
-#: ../src/glade-window.c:1377
+#: ../src/glade-window.c:1378
 #, c-format
 msgid "Could not save the file %s"
 msgstr "Nelze uložit soubor %s"
 
-#: ../src/glade-window.c:1381
+#: ../src/glade-window.c:1382
 msgid "You do not have the permissions necessary to save the file."
 msgstr "Nemáte dostatečná oprávnění nezbytná k uložení souboru."
 
-#: ../src/glade-window.c:1403
+#: ../src/glade-window.c:1404
 #, c-format
 msgid "Could not save file %s. Another project with that path is open."
 msgstr "Nelze uložit soubor %s. Je otevřený jiný projekt s touto cestou."
 
-#: ../src/glade-window.c:1428
+#: ../src/glade-window.c:1429
 msgid "No open projects to save"
 msgstr "Není otevřený žádný projekt, který by mohl být uložen"
 
-#: ../src/glade-window.c:1458
+#: ../src/glade-window.c:1459
 #, c-format
 msgid "Save changes to project \"%s\" before closing?"
 msgstr "Uložit před zavření změny do projektu „%s“?"
 
-#: ../src/glade-window.c:1466
+#: ../src/glade-window.c:1467
 msgid "Your changes will be lost if you don't save them."
 msgstr "Pokud je neuložíte, budou všechny vaše změny navždy ztraceny."
 
-#: ../src/glade-window.c:1470
+#: ../src/glade-window.c:1471
 msgid "Close _without Saving"
 msgstr "Za_vřít bez uložení"
 
-#: ../src/glade-window.c:1500
+#: ../src/glade-window.c:1501
 msgid "Save…"
 msgstr "Uložit…"
 
-#: ../src/glade-window.c:2466
+#: ../src/glade-window.c:2467
 msgid "Close document"
 msgstr "Zavřít dokument"
 
-#: ../src/glade-window.c:2568
+#: ../src/glade-window.c:2564
 msgid "Could not create a new project."
 msgstr "Nelze vytvořit nový projekt."
 
-#: ../src/glade-window.c:2621
+#: ../src/glade-window.c:2617
 #, c-format
 msgid "The project %s has unsaved changes"
 msgstr "Projekt %s obsahuje neuložené změny"
 
-#: ../src/glade-window.c:2626
+#: ../src/glade-window.c:2622
 msgid "If you reload it, all unsaved changes could be lost. Reload it anyway?"
 msgstr ""
 "Pokud jej znovu načtete, všechny neuložené změny budou ztraceny. Přejete si "
 "přesto pokračovat?"
 
-#: ../src/glade-window.c:2636
+#: ../src/glade-window.c:2632
 #, c-format
 msgid "The project file %s has been externally modified"
 msgstr "Soubor projektu %s byl externě změněn"
 
-#: ../src/glade-window.c:2641
+#: ../src/glade-window.c:2637
 msgid "Do you want to reload the project?"
 msgstr "Chcete projekt znovu načíst?"
 
-#: ../src/glade-window.c:2647
+#: ../src/glade-window.c:2643
 msgid "_Reload"
 msgstr "_Obnovit"
 
-#: ../src/glade-window.c:3216
+#: ../src/glade-window.c:3214
 msgid "Palette"
 msgstr "Paleta"
 
-#: ../src/glade-window.c:3218
+#: ../src/glade-window.c:3216
 msgid "Inspector"
 msgstr "Inspektor"
 
-#: ../src/glade-window.c:3220 ../src/glade.glade.h:33
+#: ../src/glade-window.c:3218 ../src/glade.glade.h:33
 #: ../gladeui/glade-editor.c:320 ../gladeui/glade-widget.c:1385
 #: ../gladeui/glade-project-properties.ui.h:11
 #: ../plugins/gtk+/glade-gtk-action-group.c:177
@@ -278,6 +278,30 @@ msgstr "Inspektor"
 msgid "Properties"
 msgstr "Vlastnosti"
 
+#. translators: Primary message of a dialog used to notify the user about the survey
+#: ../src/glade-window.c:3479
+msgid ""
+"We are conducting a user survey\n"
+" would you like to take it now?"
+msgstr ""
+"Provádíme průzkum mezi uživateli.\n"
+"Chtěli byste se jej nyní zůčastnit?"
+
+#. translators: Secondary text of a dialog used to notify the user about the survey
+#: ../src/glade-window.c:3483
+msgid "If not, you can always find it in the Help menu."
+msgstr "Pokud ne, kdykoliv později jej najdete v nabídce Nápověda."
+
+#: ../src/glade-window.c:3485
+msgid "_Do not show this dialog again"
+msgstr "Toto _dialogové okno příště nezobrazovat"
+
+#. translators: Text to show in the statusbar if the user did not completed the survey and choose not to show the notification dialog again
+#: ../src/glade-window.c:3506
+msgid "Go to Help -> Registration & User Survey and complete our survey!"
+msgstr ""
+"Přejděte do „Nápověda“ -> „Registrace a dotazník“ a dokončete vyplňování!"
+
 #: ../src/main.c:51
 msgid "Output version information and exit"
 msgstr "Vypíše informace o verzi a skončí"
@@ -773,50 +797,50 @@ msgstr "Zvláštní cesty ke katalogům"
 msgid "Select a catalog search path"
 msgstr "Vyberte umístění, kde katalog hledat"
 
-#: ../src/glade-registration.c:282
+#: ../src/glade-registration.c:290
 #, c-format
 msgid "Connecting to %s"
 msgstr "Připojuje se k %s"
 
-#: ../src/glade-registration.c:285
+#: ../src/glade-registration.c:293
 #, c-format
 msgid "Sending data to %s"
 msgstr "Odesílají se data na %s"
 
-#: ../src/glade-registration.c:288
+#: ../src/glade-registration.c:296
 #, c-format
 msgid "Waiting for %s"
 msgstr "Čeká se na %s"
 
-#: ../src/glade-registration.c:291
+#: ../src/glade-registration.c:299
 #, c-format
 msgid "Receiving data from %s"
 msgstr "Přijímají se data z %s"
 
-#: ../src/glade-registration.c:323
+#: ../src/glade-registration.c:331
 msgid "Sorry, automatic subscription to Glade Users mailing list failed"
 msgstr ""
 "Bohužel, ale automatické přihlášení k poštovní konferenci uživatelů Glade "
 "selhalo"
 
-#: ../src/glade-registration.c:326
+#: ../src/glade-registration.c:334
 msgid "Open Glade Users Website"
 msgstr "Otevřít web uživatelů Glade"
 
-#: ../src/glade-registration.c:378
+#: ../src/glade-registration.c:386
 msgid "Internal server error"
 msgstr "Interní chyba serveru"
 
-#: ../src/glade-registration.c:402
+#: ../src/glade-registration.c:410
 msgid "Thank you for taking the time to complete the survey, we appreciate it!"
 msgstr ""
 "Děkujeme, že jste si udělali čas na vyplnění dotazníku. Vážíme si toho!"
 
-#: ../src/glade-registration.c:407
+#: ../src/glade-registration.c:418
 msgid "Name and Email fields are required"
 msgstr "Pole se jménem a e-mailem jsou povinná"
 
-#: ../src/glade-registration.c:410
+#: ../src/glade-registration.c:421
 msgid ""
 "Ops! Email address is already in use!\n"
 "To update information you need to provide the token that was sent to your "
@@ -826,17 +850,17 @@ msgstr ""
 "Abyste mohli údaje aktualizovat, musíte zadat tiket, který jste obdrželi e-"
 "mailem."
 
-#: ../src/glade-registration.c:413
+#: ../src/glade-registration.c:424
 #, c-format
 msgid "Ops! Error saving user information: %s"
 msgstr "Problém! Chyba při ukládání údajů o uživateli: %s"
 
-#: ../src/glade-registration.c:416
+#: ../src/glade-registration.c:427
 #, c-format
 msgid "Ops! Error saving survey data: %s"
 msgstr "Problém! Chyba při ukládání dotazníkových dat: %s"
 
-#: ../src/glade-registration.c:419
+#: ../src/glade-registration.c:430
 #, c-format
 msgid "Ops! Error accessing DB: %s"
 msgstr "Problém! Chyba při přístupu k DB: %s"
@@ -1616,7 +1640,7 @@ msgstr "Nastavení více vlastností"
 msgid "Setting %s of %s"
 msgstr "Nastavení „%s“ pro „%s“"
 
-#: ../gladeui/glade-command.c:823 ../gladeui/glade-editor-property.c:3350
+#: ../gladeui/glade-command.c:823 ../gladeui/glade-editor-property.c:3355
 #, c-format
 msgid "Setting %s of %s to %s"
 msgstr "Nastavení „%s“ pro „%s“ na %s"
@@ -1901,41 +1925,41 @@ msgstr "Vlastní text"
 msgid "Custom Text to display in the property label"
 msgstr "Vlastní text pro zobrazení v popisku vlastnosti"
 
-#: ../gladeui/glade-editor-property.c:1262
+#: ../gladeui/glade-editor-property.c:1267
 msgid "Select Fields"
 msgstr "Výběr polí"
 
-#: ../gladeui/glade-editor-property.c:1285
+#: ../gladeui/glade-editor-property.c:1290
 msgid "_Select individual fields:"
 msgstr "_Označte jednotlivá pole:"
 
-#: ../gladeui/glade-editor-property.c:1635
+#: ../gladeui/glade-editor-property.c:1640
 msgid "Select Named Icon"
 msgstr "Výběr pojmenované ikony"
 
-#: ../gladeui/glade-editor-property.c:1942
+#: ../gladeui/glade-editor-property.c:1947
 msgid "Edit Text"
 msgstr "Úprava textu"
 
 #. Text
-#: ../gladeui/glade-editor-property.c:1972
+#: ../gladeui/glade-editor-property.c:1977
 msgid "_Text:"
 msgstr "_Text:"
 
 #. Translatable
-#: ../gladeui/glade-editor-property.c:2008
+#: ../gladeui/glade-editor-property.c:2013
 msgid "T_ranslatable"
 msgstr "_Přeložitelný"
 
-#: ../gladeui/glade-editor-property.c:2014 ../gladeui/glade-property.c:677
+#: ../gladeui/glade-editor-property.c:2019 ../gladeui/glade-property.c:677
 msgid "Whether this property is translatable"
 msgstr "Zda se má tato vlastnost překládat"
 
-#: ../gladeui/glade-editor-property.c:2022
+#: ../gladeui/glade-editor-property.c:2027
 msgid "Conte_xt for translation:"
 msgstr "Konte_xt pro překlad:"
 
-#: ../gladeui/glade-editor-property.c:2028
+#: ../gladeui/glade-editor-property.c:2033
 msgid ""
 "For short and ambiguous strings: type a word here to differentiate the "
 "meaning of this string from the meaning of other occurrences of the same "
@@ -1944,63 +1968,63 @@ msgstr ""
 "Pro krátké a nejednoznačné řetězce: zadejte zde slovo, které odliší význam "
 "tohoto řetězce od významu dalšího výskytu téhož řetězce"
 
-#: ../gladeui/glade-editor-property.c:2060
+#: ../gladeui/glade-editor-property.c:2065
 msgid "Co_mments for translators:"
 msgstr "Pozná_mky pro překladatele:"
 
-#: ../gladeui/glade-editor-property.c:2150
+#: ../gladeui/glade-editor-property.c:2155
 msgid "Select a file from the project resource directory"
 msgstr "Vyberte soubor ze složky s prostředky projektu"
 
 #. GtkInputPurpose enumeration value
-#: ../gladeui/glade-editor-property.c:3018
+#: ../gladeui/glade-editor-property.c:3023
 #: ../gladeui/glade-widget-adaptor.c:1392 ../gladeui/glade-widget.c:1349
 #: ../plugins/gtk+/gtk+.xml.in.h:499
 msgid "Name"
 msgstr "Název"
 
-#: ../gladeui/glade-editor-property.c:3027 ../gladeui/glade-property.c:644
+#: ../gladeui/glade-editor-property.c:3032 ../gladeui/glade-property.c:644
 msgid "Class"
 msgstr "Třída"
 
-#: ../gladeui/glade-editor-property.c:3047
+#: ../gladeui/glade-editor-property.c:3052
 #, c-format
 msgid "Choose parentless %s type objects in this project"
 msgstr "Výběr objektu typu %s bez rodičů v tomto projektu"
 
-#: ../gladeui/glade-editor-property.c:3049
+#: ../gladeui/glade-editor-property.c:3054
 #, c-format
 msgid "Choose %s type objects in this project"
 msgstr "Výběr objektu typu %s v tomto projektu"
 
-#: ../gladeui/glade-editor-property.c:3069
+#: ../gladeui/glade-editor-property.c:3074
 #, c-format
 msgid "Choose a parentless %s in this project"
 msgstr "Výběr objektu %s bez rodičů v tomto projektu"
 
-#: ../gladeui/glade-editor-property.c:3071
+#: ../gladeui/glade-editor-property.c:3076
 #, c-format
 msgid "Choose a %s in this project"
 msgstr "Výběr objektu %s v tomto projektu"
 
 #. Checklist
-#: ../gladeui/glade-editor-property.c:3128
-#: ../gladeui/glade-editor-property.c:3269
+#: ../gladeui/glade-editor-property.c:3133
+#: ../gladeui/glade-editor-property.c:3274
 msgid "O_bjects:"
 msgstr "O_bjekty:"
 
-#: ../gladeui/glade-editor-property.c:3221
+#: ../gladeui/glade-editor-property.c:3226
 msgid "_New"
 msgstr "_Nový"
 
 #. translators: Creating 'a widget' for 'a property' of 'a widget'
-#: ../gladeui/glade-editor-property.c:3376
+#: ../gladeui/glade-editor-property.c:3381
 #, c-format
 msgid "Creating %s for %s of %s"
 msgstr "Vytvoření %s pro vlastnost %s widgetu %s"
 
 #. Checklist
-#: ../gladeui/glade-editor-property.c:3572
+#: ../gladeui/glade-editor-property.c:3577
 msgid "Objects:"
 msgstr "Objekty:"
 
@@ -2306,28 +2330,28 @@ msgstr "Cesta k poskytovateli CSS"
 msgid "Path to use as the custom CSS provider for this project."
 msgstr "Cesta použitá jako vlastní poskytovatel CSS pro tento projekt."
 
-#: ../gladeui/glade-project.c:1126
+#: ../gladeui/glade-project.c:1129
 #, c-format
 msgid "(internal %s)"
 msgstr "(interní %s)"
 
-#: ../gladeui/glade-project.c:1131
+#: ../gladeui/glade-project.c:1134
 #, c-format
 msgid "(%s child)"
 msgstr "(potomek %s)"
 
-#: ../gladeui/glade-project.c:1133
+#: ../gladeui/glade-project.c:1136
 #, c-format
 msgid "(template)"
 msgstr "(šablona)"
 
 #. translators: refers to a property named '%s' of widget '%s'
-#: ../gladeui/glade-project.c:1141
+#: ../gladeui/glade-project.c:1144
 #, c-format
 msgid "(%s of %s)"
 msgstr "(%s widgetu %s)"
 
-#: ../gladeui/glade-project.c:1499
+#: ../gladeui/glade-project.c:1502
 #, c-format
 msgid ""
 "Failed to load %s.\n"
@@ -2337,26 +2361,26 @@ msgstr ""
 "Nejsou dostupné následující vyžadované katalogy: %s"
 
 #. translators: refers to project name '%s' that targets gtk version '%d.%d'
-#: ../gladeui/glade-project.c:1870
+#: ../gladeui/glade-project.c:1873
 #, c-format
 msgid "%s targets Gtk+ %d.%d"
 msgstr "%s používá Gtk+ %d.%d"
 
-#: ../gladeui/glade-project.c:1909
+#: ../gladeui/glade-project.c:1912
 msgid "Specially because there is an object that can not be build with type "
 msgstr "Zejména proto, že jeden z objektů nemůže být sestaven s typem "
 
-#: ../gladeui/glade-project.c:1914
+#: ../gladeui/glade-project.c:1917
 #, c-format
 msgid ""
 "Specially because there are %d objects that can not be build with types "
 msgstr "Zejména proto, že několik objektů (%d) nemůže být sestaveno s typy "
 
-#: ../gladeui/glade-project.c:1921
+#: ../gladeui/glade-project.c:1924
 msgid " and "
 msgstr " a "
 
-#: ../gladeui/glade-project.c:1939
+#: ../gladeui/glade-project.c:1942
 #, c-format
 msgid ""
 "But this version of Glade is for GTK+ 3 only.\n"
@@ -2369,7 +2393,7 @@ msgstr ""
 "v Glade 3.8 zavržené.\n"
 "%s"
 
-#: ../gladeui/glade-project.c:2000
+#: ../gladeui/glade-project.c:2003
 #, c-format
 msgid ""
 "An automatically saved version of `%s' is more recent.\n"
@@ -2380,7 +2404,7 @@ msgstr ""
 "\n"
 "Přejete si místo toho načíst automaticky uloženou verzi?"
 
-#: ../gladeui/glade-project.c:2140
+#: ../gladeui/glade-project.c:2143
 #, c-format
 msgid "%s document properties"
 msgstr "Vlastnosti dokumentu %s"
@@ -2393,7 +2417,7 @@ msgstr "Vlastnosti dokumentu %s"
 #. * ugly messy code with comments in line breaks inside function calls).
 #.
 #. translators: refers to a widget in toolkit version '%s %d.%d' and a project targeting toolkit version '%s %d.%d'
-#: ../gladeui/glade-project.c:2896
+#: ../gladeui/glade-project.c:2899
 #, c-format
 msgid "This widget was introduced in %s %d.%d while project targets %s %d.%d"
 msgstr ""
@@ -2401,24 +2425,24 @@ msgstr ""
 "%d"
 
 #. translators: refers to a widget '[%s]' introduced in toolkit version '%s %d.%d'
-#: ../gladeui/glade-project.c:2900
+#: ../gladeui/glade-project.c:2903
 #, c-format
 msgid "[%s] Object class '%s' was introduced in %s %d.%d\n"
 msgstr "[%s] Třída objektu „%s“ byla zavedena v %s %d.%d\n"
 
-#: ../gladeui/glade-project.c:2902
+#: ../gladeui/glade-project.c:2905
 msgid "This widget is deprecated"
 msgstr "Tento widget je zavržený"
 
 #. translators: refers to a widget '[%s]' loaded from toolkit version '%s %d.%d'
-#: ../gladeui/glade-project.c:2905
+#: ../gladeui/glade-project.c:2908
 #, c-format
 msgid "[%s] Object class '%s' from %s %d.%d is deprecated\n"
 msgstr "[%s] Třída objektu „%s“ z %s %d.%d je zavržená\n"
 
 #. translators: refers to a property in toolkit version '%s %d.%d'
 #. * and a project targeting toolkit version '%s %d.%d'
-#: ../gladeui/glade-project.c:2910
+#: ../gladeui/glade-project.c:2913
 #, c-format
 msgid "This property was introduced in %s %d.%d while project targets %s %d.%d"
 msgstr ""
@@ -2426,32 +2450,32 @@ msgstr ""
 "%s %d.%d"
 
 #. translators: refers to a property '%s' of widget '[%s]' in toolkit version '%s %d.%d'
-#: ../gladeui/glade-project.c:2914
+#: ../gladeui/glade-project.c:2917
 #, c-format
 msgid "[%s] Property '%s' of object class '%s' was introduced in %s %d.%d\n"
 msgstr "[%s] Vlastnost „%s“ objektové třídy „%s“ byla zavedena v %s %d.%d\n"
 
 #. translators: refers to a property '%s' of widget '[%s]' in toolkit version '%s %d.%d'
-#: ../gladeui/glade-project.c:2918
+#: ../gladeui/glade-project.c:2921
 #, c-format
 msgid ""
 "[%s] Packing property '%s' of object class '%s' was introduced in %s %d.%d\n"
 msgstr ""
 "[%s] Vlastnost balení „%s“ objektové třídy „%s“ byla zavedena v %s %d.%d\n"
 
-#: ../gladeui/glade-project.c:2921
+#: ../gladeui/glade-project.c:2924
 msgid "This property is deprecated"
 msgstr "Tato vlastnost je zavržená"
 
 #. translators: refers to a property '%s' of widget '[%s]'
-#: ../gladeui/glade-project.c:2924
+#: ../gladeui/glade-project.c:2927
 #, c-format
 msgid "[%s] Property '%s' of object class '%s' is deprecated"
 msgstr "[%s] Vlastnost „%s“ objektové třídy „%s“ byla zavržena"
 
 #. translators: refers to a signal in toolkit version '%s %d.%d'
 #. * and a project targeting toolkit version '%s %d.%d'
-#: ../gladeui/glade-project.c:2928
+#: ../gladeui/glade-project.c:2931
 #, c-format
 msgid "This signal was introduced in %s %d.%d while project targets %s %d.%d"
 msgstr ""
@@ -2459,76 +2483,76 @@ msgstr ""
 "%d"
 
 #. translators: refers to a signal '%s' of widget '[%s]' in toolkit version '%s %d.%d'
-#: ../gladeui/glade-project.c:2932
+#: ../gladeui/glade-project.c:2935
 #, c-format
 msgid "[%s] Signal '%s' of object class '%s' was introduced in %s %d.%d\n"
 msgstr "[%s] Signál „%s“ třídy objektu „%s“ byl zaveden v %s %d.%d\n"
 
-#: ../gladeui/glade-project.c:2935
+#: ../gladeui/glade-project.c:2938
 msgid "This signal is deprecated"
 msgstr "Tento signál je zavržený"
 
 #. translators: refers to a signal '%s' of widget '[%s]'
-#: ../gladeui/glade-project.c:2938
+#: ../gladeui/glade-project.c:2941
 #, c-format
 msgid "[%s] Signal '%s' of object class '%s' is deprecated"
 msgstr "[%s] Signál „%s“ třídy objektu „%s“ byl zavržen"
 
-#: ../gladeui/glade-project.c:3234
+#: ../gladeui/glade-project.c:3237
 msgid "Details"
 msgstr "Detaily"
 
-#: ../gladeui/glade-project.c:3249
+#: ../gladeui/glade-project.c:3252
 #, c-format
 msgid "Project \"%s\" has errors. Save anyway?"
 msgstr "Projekt „%s“ obsahuje chyby. Přesto uložit?"
 
-#: ../gladeui/glade-project.c:3250
+#: ../gladeui/glade-project.c:3253
 #, c-format
 msgid "Project \"%s\" has deprecated widgets and/or version mismatches."
 msgstr "Projekt „%s“ obsahuje zavržené widgety a/nebo nesprávné verze."
 
-#: ../gladeui/glade-project.c:3277
+#: ../gladeui/glade-project.c:3280
 #, c-format
 msgid "Object %s has unrecognized type %s\n"
 msgstr "Objekt %s má nerozpoznaný typ %s\n"
 
-#: ../gladeui/glade-project.c:4747
+#: ../gladeui/glade-project.c:4750
 #, c-format
 msgid "Unsaved %i"
 msgstr "Neuložený %i"
 
-#: ../gladeui/glade-project.c:5046 ../gladeui/glade-project.c:5097
-#: ../gladeui/glade-project.c:5254
+#: ../gladeui/glade-project.c:5049 ../gladeui/glade-project.c:5100
+#: ../gladeui/glade-project.c:5257
 msgid "No widget selected."
 msgstr "Není vybrán žádný widget."
 
-#: ../gladeui/glade-project.c:5062
+#: ../gladeui/glade-project.c:5065
 msgid "Unable to copy unrecognized widget type."
 msgstr "Nelze kopírovat widget nerozpoznaného typu"
 
-#: ../gladeui/glade-project.c:5094
+#: ../gladeui/glade-project.c:5097
 msgid "Unable to cut unrecognized widget type"
 msgstr "Nelze vyjmout widget nerozpoznaného typu"
 
-#: ../gladeui/glade-project.c:5146
+#: ../gladeui/glade-project.c:5149
 msgid "Unable to paste to the selected parent"
 msgstr "Do vybraného rodiče není možné vkládat"
 
-#: ../gladeui/glade-project.c:5157
+#: ../gladeui/glade-project.c:5160
 msgid "Unable to paste to multiple widgets"
 msgstr "Není možné vkládat do více widgetů"
 
-#: ../gladeui/glade-project.c:5167
+#: ../gladeui/glade-project.c:5170
 msgid "No widget on the clipboard"
 msgstr "Ve schránce není žádný widget"
 
-#: ../gladeui/glade-project.c:5212
+#: ../gladeui/glade-project.c:5215
 msgid "Only one widget can be pasted at a time to this container"
 msgstr ""
 "Do tohoto kontejneru může být v jednom okamžiku vložen jen jeden widget"
 
-#: ../gladeui/glade-project.c:5224
+#: ../gladeui/glade-project.c:5227
 msgid "Insufficient amount of placeholders in target container"
 msgstr "Nedostatečné množství vyhrazených míst v cílovém kontejneru"
 

po/es.po

@@ -7,22 +7,23 @@
 # Francisco Javier F. Serrador <serrador@cvs.gnome.org>, 2005, 2006.
 # Jorge González <jorgegonz@svn.gnome.org>, 2007, 2009, 2010, 2011.
 # Daniel Mustieles <daniel.mustieles@gmail.com>, 2010, 2011, 2012, 2013, 2014.
+# Juan Pablo Ugarte <juanpablougarte@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: glade3.master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=glade&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-03-14 06:45+0000\n"
-"PO-Revision-Date: 2014-03-14 10:37+0100\n"
-"Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
-"Language-Team: Español <gnome-es-list@gnome.org>\n"
+"POT-Creation-Date: 2014-04-15 06:19+0000\n"
+"PO-Revision-Date: 2014-03-28 11:35-0300\n"
+"Last-Translator: Juan Pablo Ugarte <juanpablougarte@gmail.com>\n"
+"Language-Team: Spanish; Castilian <>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Gtranslator 2.91.5\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"X-Generator: Gtranslator 2.91.6\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../data/glade.desktop.in.in.h:1 ../src/main.c:42
 msgid "Glade"
@@ -81,194 +82,194 @@ msgstr ""
 msgid "[Read Only]"
 msgstr "[Sólo lectura]"
 
-#: ../src/glade-window.c:322
+#: ../src/glade-window.c:323
 msgid "User Interface Designer"
 msgstr "Diseñador de interfaces de usuario"
 
 #. translators: referring to the action of activating a file named '%s'.
 #. *              we also indicate to users that the file may be read-only with
 #. *              the second '%s'
-#: ../src/glade-window.c:523
+#: ../src/glade-window.c:524
 #, c-format
 msgid "Activate '%s' %s"
 msgstr "Activar «%s» «%s»"
 
 #. translators: referring to the action of activating a file named '%s'
 #. FIXME add hint for translators
-#: ../src/glade-window.c:529 ../src/glade-window.c:537
+#: ../src/glade-window.c:530 ../src/glade-window.c:538
 #, c-format
 msgid "Activate '%s'"
 msgstr "Activar «%s»"
 
 #. Name
-#: ../src/glade-window.c:585 ../src/glade-registration.glade.h:4
+#: ../src/glade-window.c:586 ../src/glade-registration.glade.h:4
 #: ../gladeui/glade-base-editor.c:2030
 #: ../gladeui/glade-project-properties.ui.h:12
 #: ../plugins/gtk+/glade-about-dialog-editor.ui.h:2
 msgid "Name:"
 msgstr "Nombre:"
 
-#: ../src/glade-window.c:588
+#: ../src/glade-window.c:589
 msgid "Requires:"
 msgstr "Requiere:"
 
-#: ../src/glade-window.c:647
+#: ../src/glade-window.c:648
 msgid "_Undo"
 msgstr "_Deshacer"
 
-#: ../src/glade-window.c:650
+#: ../src/glade-window.c:651
 #, c-format
 msgid "Undo: %s"
 msgstr "Deshacer: %s"
 
-#: ../src/glade-window.c:651 ../src/glade-window.c:662
+#: ../src/glade-window.c:652 ../src/glade-window.c:663
 msgid "the last action"
 msgstr "la última acción"
 
-#: ../src/glade-window.c:658
+#: ../src/glade-window.c:659
 msgid "_Redo"
 msgstr "_Rehacer"
 
-#: ../src/glade-window.c:661
+#: ../src/glade-window.c:662
 #, c-format
 msgid "Redo: %s"
 msgstr "Rehacer: %s"
 
-#: ../src/glade-window.c:693
+#: ../src/glade-window.c:694
 #, c-format
 msgid "Autosaving '%s'"
 msgstr "Autoguardando «%s»"
 
-#: ../src/glade-window.c:698
+#: ../src/glade-window.c:699
 #, c-format
 msgid "Error autosaving '%s'"
 msgstr "Erro al autoguardar «%s»"
 
-#: ../src/glade-window.c:1117
+#: ../src/glade-window.c:1118
 msgid "Open…"
 msgstr "Abrir…"
 
-#: ../src/glade-window.c:1151
+#: ../src/glade-window.c:1152
 #, c-format
 msgid "Project %s is still loading."
 msgstr "Aún se está cargando el proyecto «%s»."
 
-#: ../src/glade-window.c:1170
+#: ../src/glade-window.c:1171
 msgid "Failed to backup existing file, continue saving?"
 msgstr ""
 "Falló al hacer una copia de seguridad del archivo existente, ¿continuar el "
 "guardado?"
 
-#: ../src/glade-window.c:1192
+#: ../src/glade-window.c:1193
 #, c-format
 msgid "Failed to save %s: %s"
 msgstr "Falló al guardar %s: %s"
 
-#: ../src/glade-window.c:1231
+#: ../src/glade-window.c:1232
 #, c-format
 msgid "The file %s has been modified since reading it"
 msgstr "El archivo «%s» ha sido modificado desde que fue leído"
 
-#: ../src/glade-window.c:1235
+#: ../src/glade-window.c:1236
 msgid "If you save it, all the external changes could be lost. Save it anyway?"
 msgstr ""
 "Si lo guarda, todos los cambios externos pueden perderse. ¿Guardarlo de "
 "todos modos?"
 
-#: ../src/glade-window.c:1240
+#: ../src/glade-window.c:1241
 msgid "_Save Anyway"
 msgstr "_Guardar de todos modos"
 
-#: ../src/glade-window.c:1248
+#: ../src/glade-window.c:1249
 msgid "_Don't Save"
 msgstr "_No guardar"
 
-#: ../src/glade-window.c:1282
+#: ../src/glade-window.c:1283
 #, c-format
 msgid "Project '%s' saved"
 msgstr "Proyecto «%s» guardado"
 
-#: ../src/glade-window.c:1313
+#: ../src/glade-window.c:1314
 msgid "Save As…"
 msgstr "Guardar como…"
 
-#: ../src/glade-window.c:1377
+#: ../src/glade-window.c:1378
 #, c-format
 msgid "Could not save the file %s"
 msgstr "No se pudo guardar el archivo %s"
 
-#: ../src/glade-window.c:1381
+#: ../src/glade-window.c:1382
 msgid "You do not have the permissions necessary to save the file."
 msgstr "No tiene los permisos necesarios para guardar el archivo."
 
-#: ../src/glade-window.c:1403
+#: ../src/glade-window.c:1404
 #, c-format
 msgid "Could not save file %s. Another project with that path is open."
 msgstr ""
 "No se pudo guardar el archivo %s. Otro proyecto con esa ruta está abierto."
 
-#: ../src/glade-window.c:1428
+#: ../src/glade-window.c:1429
 msgid "No open projects to save"
 msgstr "Ningún proyecto abierto para guardar"
 
-#: ../src/glade-window.c:1458
+#: ../src/glade-window.c:1459
 #, c-format
 msgid "Save changes to project \"%s\" before closing?"
 msgstr "¿Guardar los cambios del proyecto «%s» antes de cerrar?"
 
-#: ../src/glade-window.c:1466
+#: ../src/glade-window.c:1467
 msgid "Your changes will be lost if you don't save them."
 msgstr "Sus cambios se perderán si no los guarda."
 
-#: ../src/glade-window.c:1470
+#: ../src/glade-window.c:1471
 msgid "Close _without Saving"
 msgstr "Cerrar _sin guardar"
 
-#: ../src/glade-window.c:1500
+#: ../src/glade-window.c:1501
 msgid "Save…"
 msgstr "Guardar…"
 
-#: ../src/glade-window.c:2466
+#: ../src/glade-window.c:2467
 msgid "Close document"
 msgstr "Cerrar el documento"
 
-#: ../src/glade-window.c:2568
+#: ../src/glade-window.c:2564
 msgid "Could not create a new project."
 msgstr "No se pudo crear un proyecto nuevo."
 
-#: ../src/glade-window.c:2621
+#: ../src/glade-window.c:2617
 #, c-format
 msgid "The project %s has unsaved changes"
 msgstr "El proyecto %s tiene cambios no guardados"
 
-#: ../src/glade-window.c:2626
+#: ../src/glade-window.c:2622
 msgid "If you reload it, all unsaved changes could be lost. Reload it anyway?"
 msgstr ""
 "Si lo recarga, todos los cambios externos pueden perderse. ¿Recargarlo de "
 "todos modos?"
 
-#: ../src/glade-window.c:2636
+#: ../src/glade-window.c:2632
 #, c-format
 msgid "The project file %s has been externally modified"
 msgstr "El archivo de proyecto «%s» ha sido modificado externamente"
 
-#: ../src/glade-window.c:2641
+#: ../src/glade-window.c:2637
 msgid "Do you want to reload the project?"
 msgstr "¿Quiere volver a cargar el proyecto?"
 
-#: ../src/glade-window.c:2647
+#: ../src/glade-window.c:2643
 msgid "_Reload"
 msgstr "Re_cargar"
 
-#: ../src/glade-window.c:3216
+#: ../src/glade-window.c:3214
 msgid "Palette"
 msgstr "Paleta"
 
-#: ../src/glade-window.c:3218
+#: ../src/glade-window.c:3216
 msgid "Inspector"
 msgstr "Inspector"
 
-#: ../src/glade-window.c:3220 ../src/glade.glade.h:33
+#: ../src/glade-window.c:3218 ../src/glade.glade.h:33
 #: ../gladeui/glade-editor.c:320 ../gladeui/glade-widget.c:1385
 #: ../gladeui/glade-project-properties.ui.h:11
 #: ../plugins/gtk+/glade-gtk-action-group.c:177
@@ -281,6 +282,30 @@ msgstr "Inspector"
 msgid "Properties"
 msgstr "Propiedades"
 
+#. translators: Primary message of a dialog used to notify the user about the survey
+#: ../src/glade-window.c:3479
+msgid ""
+"We are conducting a user survey\n"
+" would you like to take it now?"
+msgstr ""
+"Estamos llevando a cabo una encuesta de usuarios\n"
+"¿le gustaría tomarla en este momento?"
+
+#. translators: Secondary text of a dialog used to notify the user about the survey
+#: ../src/glade-window.c:3483
+msgid "If not, you can always find it in the Help menu."
+msgstr "Sino, siempre puede encontrarla en el menú Ayuda"
+
+#: ../src/glade-window.c:3485
+msgid "_Do not show this dialog again"
+msgstr "_No mostrar este dialogo nuevamente"
+
+#. translators: Text to show in the statusbar if the user did not completed the survey and choose not to show the notification dialog again
+#: ../src/glade-window.c:3506
+msgid "Go to Help -> Registration & User Survey and complete our survey!"
+msgstr ""
+"Ve a Ayuda -> Registro y encuesta de usuarios y completa nuestra encuesta!"
+
 #: ../src/main.c:51
 msgid "Output version information and exit"
 msgstr "Despliega información de la versión y termina"
@@ -784,48 +809,48 @@ msgstr "Rutas de catálogos adicionales"
 msgid "Select a catalog search path"
 msgstr "Seleccionar una rutas de búsqueda de catálogos"
 
-#: ../src/glade-registration.c:282
+#: ../src/glade-registration.c:290
 #, c-format
 msgid "Connecting to %s"
 msgstr "Conectando a %s"
 
-#: ../src/glade-registration.c:285
+#: ../src/glade-registration.c:293
 #, c-format
 msgid "Sending data to %s"
 msgstr "Enviando datos a %s"
 
-#: ../src/glade-registration.c:288
+#: ../src/glade-registration.c:296
 #, c-format
 msgid "Waiting for %s"
 msgstr "Esperando a %s"
 
-#: ../src/glade-registration.c:291
+#: ../src/glade-registration.c:299
 #, c-format
 msgid "Receiving data from %s"
 msgstr "Recibiendo datos de %s"
 
-#: ../src/glade-registration.c:323
+#: ../src/glade-registration.c:331
 msgid "Sorry, automatic subscription to Glade Users mailing list failed"
 msgstr ""
 "Falló la suscripción automática a la lista de correo de usuarios de Glade"
 
-#: ../src/glade-registration.c:326
+#: ../src/glade-registration.c:334
 msgid "Open Glade Users Website"
 msgstr "Abrir la página web de usuarios de Glade"
 
-#: ../src/glade-registration.c:378
+#: ../src/glade-registration.c:386
 msgid "Internal server error"
 msgstr "Error interno del servidor"
 
-#: ../src/glade-registration.c:402
+#: ../src/glade-registration.c:410
 msgid "Thank you for taking the time to complete the survey, we appreciate it!"
 msgstr "Gracias por completar la encuesta."
 
-#: ../src/glade-registration.c:407
+#: ../src/glade-registration.c:418
 msgid "Name and Email fields are required"
 msgstr "Los campos Nombre y Correo-e son obligatorios"
 
-#: ../src/glade-registration.c:410
+#: ../src/glade-registration.c:421
 msgid ""
 "Ops! Email address is already in use!\n"
 "To update information you need to provide the token that was sent to your "
@@ -835,17 +860,17 @@ msgstr ""
 "Para actualizar la información necesita proporcionar el testigo que se le ha "
 "enviado a su correo."
 
-#: ../src/glade-registration.c:413
+#: ../src/glade-registration.c:424
 #, c-format
 msgid "Ops! Error saving user information: %s"
 msgstr "Error al guardar la información del usuario: %s"
 
-#: ../src/glade-registration.c:416
+#: ../src/glade-registration.c:427
 #, c-format
 msgid "Ops! Error saving survey data: %s"
 msgstr "Error al guardar los datos de la encuesta: %s"
 
-#: ../src/glade-registration.c:419
+#: ../src/glade-registration.c:430
 #, c-format
 msgid "Ops! Error accessing DB: %s"
 msgstr "Error al acceder a la BB.DD: %s"
@@ -1006,7 +1031,7 @@ msgstr "Perl"
 
 #. GtkCellRendererAccelMode enumeration value
 #: ../src/glade-registration.glade.h:39
-#: ../gladeui/glade-project-properties.ui.h:28
+#: ../gladeui/glade-project-properties.ui.h:19
 #: ../plugins/gtk+/gtk+.xml.in.h:685
 msgid "Other"
 msgstr "Otro"
@@ -1630,7 +1655,7 @@ msgstr "Estableciendo propiedades múltiples"
 msgid "Setting %s of %s"
 msgstr "Estableciendo %s de %s"
 
-#: ../gladeui/glade-command.c:823 ../gladeui/glade-editor-property.c:3350
+#: ../gladeui/glade-command.c:823 ../gladeui/glade-editor-property.c:3355
 #, c-format
 msgid "Setting %s of %s to %s"
 msgstr "Estableciendo %s de %s a %s"
@@ -1919,41 +1944,41 @@ msgstr "Texto personalizado"
 msgid "Custom Text to display in the property label"
 msgstr "Testo personalizado que mostrar en la etiqueta de la propiedad"
 
-#: ../gladeui/glade-editor-property.c:1262
+#: ../gladeui/glade-editor-property.c:1267
 msgid "Select Fields"
 msgstr "Seleccionar campos"
 
-#: ../gladeui/glade-editor-property.c:1285
+#: ../gladeui/glade-editor-property.c:1290
 msgid "_Select individual fields:"
 msgstr "_Seleccionar campos individuales:"
 
-#: ../gladeui/glade-editor-property.c:1635
+#: ../gladeui/glade-editor-property.c:1640
 msgid "Select Named Icon"
 msgstr "Seleccionar icono de nombre"
 
-#: ../gladeui/glade-editor-property.c:1942
+#: ../gladeui/glade-editor-property.c:1947
 msgid "Edit Text"
 msgstr "Editar texto"
 
 #. Text
-#: ../gladeui/glade-editor-property.c:1972
+#: ../gladeui/glade-editor-property.c:1977
 msgid "_Text:"
 msgstr "_Texto:"
 
 #. Translatable
-#: ../gladeui/glade-editor-property.c:2008
+#: ../gladeui/glade-editor-property.c:2013
 msgid "T_ranslatable"
 msgstr "_Traducible"
 
-#: ../gladeui/glade-editor-property.c:2014 ../gladeui/glade-property.c:677
+#: ../gladeui/glade-editor-property.c:2019 ../gladeui/glade-property.c:678
 msgid "Whether this property is translatable"
 msgstr "Indica si esta propiedad se puede traducir"
 
-#: ../gladeui/glade-editor-property.c:2022
+#: ../gladeui/glade-editor-property.c:2027
 msgid "Conte_xt for translation:"
 msgstr "Conte_xto para traducción:"
 
-#: ../gladeui/glade-editor-property.c:2028
+#: ../gladeui/glade-editor-property.c:2033
 msgid ""
 "For short and ambiguous strings: type a word here to differentiate the "
 "meaning of this string from the meaning of other occurrences of the same "
@@ -1963,63 +1988,63 @@ msgstr ""
 "significado de esta cadena del significado de otras ocurrencias de la misma "
 "cadena"
 
-#: ../gladeui/glade-editor-property.c:2060
+#: ../gladeui/glade-editor-property.c:2065
 msgid "Co_mments for translators:"
 msgstr "_Comentarios para los traductores:"
 
-#: ../gladeui/glade-editor-property.c:2150
+#: ../gladeui/glade-editor-property.c:2155
 msgid "Select a file from the project resource directory"
 msgstr "Seleccionar un archivo desde la carpeta de recursos del proyecto"
 
 #. GtkInputPurpose enumeration value
-#: ../gladeui/glade-editor-property.c:3018
+#: ../gladeui/glade-editor-property.c:3023
 #: ../gladeui/glade-widget-adaptor.c:1392 ../gladeui/glade-widget.c:1349
 #: ../plugins/gtk+/gtk+.xml.in.h:499
 msgid "Name"
 msgstr "Nombre"
 
-#: ../gladeui/glade-editor-property.c:3027 ../gladeui/glade-property.c:644
+#: ../gladeui/glade-editor-property.c:3032 ../gladeui/glade-property.c:645
 msgid "Class"
 msgstr "Clase"
 
-#: ../gladeui/glade-editor-property.c:3047
+#: ../gladeui/glade-editor-property.c:3052
 #, c-format
 msgid "Choose parentless %s type objects in this project"
 msgstr "Elegir tipos de objeto %s huérfanos en este proyecto"
 
-#: ../gladeui/glade-editor-property.c:3049
+#: ../gladeui/glade-editor-property.c:3054
 #, c-format
 msgid "Choose %s type objects in this project"
 msgstr "Elegir tipos de objeto %s en este proyecto"
 
-#: ../gladeui/glade-editor-property.c:3069
+#: ../gladeui/glade-editor-property.c:3074
 #, c-format
 msgid "Choose a parentless %s in this project"
 msgstr "Eligir un %s huérfano en este proyecto"
 
-#: ../gladeui/glade-editor-property.c:3071
+#: ../gladeui/glade-editor-property.c:3076
 #, c-format
 msgid "Choose a %s in this project"
 msgstr "Elija un %s en este proyecto"
 
 #. Checklist
-#: ../gladeui/glade-editor-property.c:3128
-#: ../gladeui/glade-editor-property.c:3269
+#: ../gladeui/glade-editor-property.c:3133
+#: ../gladeui/glade-editor-property.c:3274
 msgid "O_bjects:"
 msgstr "O_bjetos:"
 
-#: ../gladeui/glade-editor-property.c:3221
+#: ../gladeui/glade-editor-property.c:3226
 msgid "_New"
 msgstr "_Nuevo"
 
 #. translators: Creating 'a widget' for 'a property' of 'a widget'
-#: ../gladeui/glade-editor-property.c:3376
+#: ../gladeui/glade-editor-property.c:3381
 #, c-format
 msgid "Creating %s for %s of %s"
 msgstr "Creando %s para %s de %s"
 
 #. Checklist
-#: ../gladeui/glade-editor-property.c:3572
+#: ../gladeui/glade-editor-property.c:3577
 msgid "Objects:"
 msgstr "Objetos:"
 
@@ -2326,28 +2351,28 @@ msgstr "Ruta del proveedor de CSS"
 msgid "Path to use as the custom CSS provider for this project."
 msgstr "Ruta que usar como proveedor de CSS personalizado para este proyecto."
 
-#: ../gladeui/glade-project.c:1126
+#: ../gladeui/glade-project.c:1129
 #, c-format
 msgid "(internal %s)"
 msgstr "(interno %s)"
 
-#: ../gladeui/glade-project.c:1131
+#: ../gladeui/glade-project.c:1134
 #, c-format
 msgid "(%s child)"
 msgstr "(hijo de %s)"
 
-#: ../gladeui/glade-project.c:1133
+#: ../gladeui/glade-project.c:1136
 #, c-format
 msgid "(template)"
 msgstr "(plantilla)"
 
 #. translators: refers to a property named '%s' of widget '%s'
-#: ../gladeui/glade-project.c:1141
+#: ../gladeui/glade-project.c:1144
 #, c-format
 msgid "(%s of %s)"
 msgstr "(%s de %s)"
 
-#: ../gladeui/glade-project.c:1499
+#: ../gladeui/glade-project.c:1502
 #, c-format
 msgid ""
 "Failed to load %s.\n"
@@ -2357,17 +2382,17 @@ msgstr ""
 "Los siguientes catálogos requeridos no están disponibles: %s"
 
 #. translators: refers to project name '%s' that targets gtk version '%d.%d'
-#: ../gladeui/glade-project.c:1870
+#: ../gladeui/glade-project.c:1873
 #, c-format
 msgid "%s targets Gtk+ %d.%d"
 msgstr "%s usa GTK+ %d.%d"
 
-#: ../gladeui/glade-project.c:1909
+#: ../gladeui/glade-project.c:1912
 msgid "Specially because there is an object that can not be build with type "
 msgstr ""
 "Especialmente porque existe un objeto que no se puede construir con el tipo "
 
-#: ../gladeui/glade-project.c:1914
+#: ../gladeui/glade-project.c:1917
 #, c-format
 msgid ""
 "Specially because there are %d objects that can not be build with types "
@@ -2375,11 +2400,11 @@ msgstr ""
 "Especialmente porque existen %d objetos que no se pueden construir con los "
 "tipos "
 
-#: ../gladeui/glade-project.c:1921
+#: ../gladeui/glade-project.c:1924
 msgid " and "
 msgstr " y "
 
-#: ../gladeui/glade-project.c:1939
+#: ../gladeui/glade-project.c:1942
 #, c-format
 msgid ""
 "But this version of Glade is for GTK+ 3 only.\n"
@@ -2392,7 +2417,7 @@ msgstr ""
 "widgets obsoletos.\n"
 "%s"
 
-#: ../gladeui/glade-project.c:2000
+#: ../gladeui/glade-project.c:2003
 #, c-format
 msgid ""
 "An automatically saved version of `%s' is more recent.\n"
@@ -2403,7 +2428,7 @@ msgstr ""
 "\n"
 "¿Quiere cargar la versión autoguardada en su lugar?"
 
-#: ../gladeui/glade-project.c:2140
+#: ../gladeui/glade-project.c:2143
 #, c-format
 msgid "%s document properties"
 msgstr "Propiedades del documento %s"
@@ -2416,7 +2441,7 @@ msgstr "Propiedades del documento %s"
 #. * ugly messy code with comments in line breaks inside function calls).
 #.
 #. translators: refers to a widget in toolkit version '%s %d.%d' and a project targeting toolkit version '%s %d.%d'
-#: ../gladeui/glade-project.c:2896
+#: ../gladeui/glade-project.c:2905
 #, c-format
 msgid "This widget was introduced in %s %d.%d while project targets %s %d.%d"
 msgstr ""
@@ -2424,24 +2449,24 @@ msgstr ""
 "%d.%d"
 
 #. translators: refers to a widget '[%s]' introduced in toolkit version '%s %d.%d'
-#: ../gladeui/glade-project.c:2900
+#: ../gladeui/glade-project.c:2909
 #, c-format
 msgid "[%s] Object class '%s' was introduced in %s %d.%d\n"
 msgstr "[%s] La clase del objeto «%s» se introdujo en %s %d.%d\n"
 
-#: ../gladeui/glade-project.c:2902
+#: ../gladeui/glade-project.c:2911
 msgid "This widget is deprecated"
 msgstr "Este widget está obsoleto"
 
 #. translators: refers to a widget '[%s]' loaded from toolkit version '%s %d.%d'
-#: ../gladeui/glade-project.c:2905
+#: ../gladeui/glade-project.c:2914
 #, c-format
 msgid "[%s] Object class '%s' from %s %d.%d is deprecated\n"
 msgstr "[%s] La clase del objeto «%s» de %s %d.%d está obsoleta\n"
 
 #. translators: refers to a property in toolkit version '%s %d.%d'
 #. * and a project targeting toolkit version '%s %d.%d'
-#: ../gladeui/glade-project.c:2910
+#: ../gladeui/glade-project.c:2919
 #, c-format
 msgid "This property was introduced in %s %d.%d while project targets %s %d.%d"
 msgstr ""
@@ -2449,14 +2474,14 @@ msgstr ""
 "%s %d.%d"
 
 #. translators: refers to a property '%s' of widget '[%s]' in toolkit version '%s %d.%d'
-#: ../gladeui/glade-project.c:2914
+#: ../gladeui/glade-project.c:2923
 #, c-format
 msgid "[%s] Property '%s' of object class '%s' was introduced in %s %d.%d\n"
 msgstr ""
 "[%s] La propiedad «%s» de la clase de objeto«%s» se introdujo en %s %d.%d\n"
 
 #. translators: refers to a property '%s' of widget '[%s]' in toolkit version '%s %d.%d'
-#: ../gladeui/glade-project.c:2918
+#: ../gladeui/glade-project.c:2927
 #, c-format
 msgid ""
 "[%s] Packing property '%s' of object class '%s' was introduced in %s %d.%d\n"
@@ -2464,19 +2489,19 @@ msgstr ""
 "[%s] La propiedad de empaquetado «%s» de la clase del objeto «%s» se "
 "introdujo en %s %d.%d\n"
 
-#: ../gladeui/glade-project.c:2921
+#: ../gladeui/glade-project.c:2930
 msgid "This property is deprecated"
 msgstr "Esta propiedad está obsoleta"
 
 #. translators: refers to a property '%s' of widget '[%s]'
-#: ../gladeui/glade-project.c:2924
+#: ../gladeui/glade-project.c:2933
 #, c-format
 msgid "[%s] Property '%s' of object class '%s' is deprecated"
 msgstr "[%s] La propiedad «%s» de la clase de objeto«%s» está obsoleta"
 
 #. translators: refers to a signal in toolkit version '%s %d.%d'
 #. * and a project targeting toolkit version '%s %d.%d'
-#: ../gladeui/glade-project.c:2928
+#: ../gladeui/glade-project.c:2937
 #, c-format
 msgid "This signal was introduced in %s %d.%d while project targets %s %d.%d"
 msgstr ""
@@ -2484,78 +2509,78 @@ msgstr ""
 "%d"
 
 #. translators: refers to a signal '%s' of widget '[%s]' in toolkit version '%s %d.%d'
-#: ../gladeui/glade-project.c:2932
+#: ../gladeui/glade-project.c:2941
 #, c-format
 msgid "[%s] Signal '%s' of object class '%s' was introduced in %s %d.%d\n"
 msgstr ""
 "[%s] La señal «%s» de la clase de objeto «%s» se introdujo en %s %d.%d\n"
 
-#: ../gladeui/glade-project.c:2935
+#: ../gladeui/glade-project.c:2944
 msgid "This signal is deprecated"
 msgstr "La señal está obsoleta"
 
 #. translators: refers to a signal '%s' of widget '[%s]'
-#: ../gladeui/glade-project.c:2938
+#: ../gladeui/glade-project.c:2947
 #, c-format
 msgid "[%s] Signal '%s' of object class '%s' is deprecated"
 msgstr ""
 "[%s] La señal «%s» de la clase de objeto «%s» se introdujo está obsoleta"
 
-#: ../gladeui/glade-project.c:3234
+#: ../gladeui/glade-project.c:3243
 msgid "Details"
 msgstr "Detalles"
 
-#: ../gladeui/glade-project.c:3249
+#: ../gladeui/glade-project.c:3258
 #, c-format
 msgid "Project \"%s\" has errors. Save anyway?"
 msgstr "El proyecto «%s» tiene errores. ¿Guardarlo de todas formas?"
 
-#: ../gladeui/glade-project.c:3250
+#: ../gladeui/glade-project.c:3259
 #, c-format
 msgid "Project \"%s\" has deprecated widgets and/or version mismatches."
 msgstr ""
 "El proyecto «%s» tiene widgets obsoletos y/o inconsistencias entre versiones."
 
-#: ../gladeui/glade-project.c:3277
+#: ../gladeui/glade-project.c:3286
 #, c-format
 msgid "Object %s has unrecognized type %s\n"
 msgstr "El objeto %s tiene un tipo %s no reconocido\n"
 
-#: ../gladeui/glade-project.c:4747
+#: ../gladeui/glade-project.c:4756
 #, c-format
 msgid "Unsaved %i"
 msgstr "Sin guardar %i"
 
-#: ../gladeui/glade-project.c:5046 ../gladeui/glade-project.c:5097
-#: ../gladeui/glade-project.c:5254
+#: ../gladeui/glade-project.c:5055 ../gladeui/glade-project.c:5106
+#: ../gladeui/glade-project.c:5263
 msgid "No widget selected."
 msgstr "No hay ningún widget seleccionado."
 
-#: ../gladeui/glade-project.c:5062
+#: ../gladeui/glade-project.c:5071
 msgid "Unable to copy unrecognized widget type."
 msgstr "No se pudo copiar el tipo de widget no reconocido."
 
-#: ../gladeui/glade-project.c:5094
+#: ../gladeui/glade-project.c:5103
 msgid "Unable to cut unrecognized widget type"
 msgstr "No se pudo cortar el tipo de widget no reconocido."
 
-#: ../gladeui/glade-project.c:5146
+#: ../gladeui/glade-project.c:5155
 msgid "Unable to paste to the selected parent"
 msgstr "Imposible pegar al padre seleccionado"
 
-#: ../gladeui/glade-project.c:5157
+#: ../gladeui/glade-project.c:5166
 msgid "Unable to paste to multiple widgets"
 msgstr "Imposible pegar múltiples widgets"
 
-#: ../gladeui/glade-project.c:5167
+#: ../gladeui/glade-project.c:5176
 msgid "No widget on the clipboard"
 msgstr "No hay ningún widget en el portapapeles"
 
-#: ../gladeui/glade-project.c:5212
+#: ../gladeui/glade-project.c:5221
 msgid "Only one widget can be pasted at a time to this container"
 msgstr "Sólo se puede pegar un widget cada vez en este contenedor"
 
-#: ../gladeui/glade-project.c:5224
+#: ../gladeui/glade-project.c:5233
 msgid "Insufficient amount of placeholders in target container"
 msgstr ""
 "Cantidad insuficiente de lugares de colocación en el contenedor destino"
@@ -2570,54 +2595,54 @@ msgid "Project %s has no deprecated widgets or version mismatches."
 msgstr ""
 "El proyecto %s no tiene widgets obsoletos o inconsistencias entre versiones."
 
-#: ../gladeui/glade-property.c:645
+#: ../gladeui/glade-property.c:646
 msgid "The GladePropertyClass for this property"
 msgstr "La GladePropertyClass para esta propiedad"
 
-#: ../gladeui/glade-property.c:650
+#: ../gladeui/glade-property.c:651
 msgid "Enabled"
 msgstr "Activado"
 
-#: ../gladeui/glade-property.c:651
+#: ../gladeui/glade-property.c:652
 msgid "If the property is optional, this is its enabled state"
 msgstr "Si la propiedad es opcional, esto está en su estado activado"
 
-#: ../gladeui/glade-property.c:656 ../gladeui/glade-widget-action.c:190
+#: ../gladeui/glade-property.c:657 ../gladeui/glade-widget-action.c:190
 msgid "Sensitive"
 msgstr "Sensible"
 
-#: ../gladeui/glade-property.c:657
+#: ../gladeui/glade-property.c:658
 msgid "This gives backends control to set property sensitivity"
 msgstr ""
 "Esto proporciona a los backend el control para establecer la propiedad de "
 "sensibilidad"
 
-#: ../gladeui/glade-property.c:662
+#: ../gladeui/glade-property.c:663
 msgid "Context"
 msgstr "Contexto"
 
-#: ../gladeui/glade-property.c:663
+#: ../gladeui/glade-property.c:664
 msgid "Context for translation"
 msgstr "Comentario para traducción"
 
 #. AtkRole enumeration value
-#: ../gladeui/glade-property.c:669 ../plugins/gtk+/gtk+.xml.in.h:269
+#: ../gladeui/glade-property.c:670 ../plugins/gtk+/gtk+.xml.in.h:269
 msgid "Comment"
 msgstr "Comentario"
 
-#: ../gladeui/glade-property.c:670
+#: ../gladeui/glade-property.c:671
 msgid "Comment for translators"
 msgstr "Comentario para los traductores"
 
-#: ../gladeui/glade-property.c:676
+#: ../gladeui/glade-property.c:677
 msgid "Translatable"
 msgstr "Traducible"
 
-#: ../gladeui/glade-property.c:683
+#: ../gladeui/glade-property.c:684
 msgid "Visual State"
 msgstr "Estado visual"
 
-#: ../gladeui/glade-property.c:684
+#: ../gladeui/glade-property.c:685
 msgid "Priority information for the property editor to act on"
 msgstr ""
 "Información de prioridad para que el editor de propiedades actúe sobre ella"
@@ -2663,7 +2688,7 @@ msgstr "Indica si la propiedad que cargar es una propiedad de empaquetado o no"
 
 #: ../gladeui/glade-property-label.c:153
 msgid "Custom text to override the property name"
-msgstr "Testo personalizado para sobreescribir el nombre de la propiedad"
+msgstr "Testo personalizado para sobrescribir el nombre de la propiedad"
 
 #: ../gladeui/glade-property-label.c:158
 msgid "Custom Tooltip"
@@ -2672,7 +2697,7 @@ msgstr "Sugerencia personalizada"
 #: ../gladeui/glade-property-label.c:159
 msgid "Custom tooltip to override the property description"
 msgstr ""
-"Sugerencia personalizada para sobreescribir la descripción de la propiedad"
+"Sugerencia personalizada para sobrescribir la descripción de la propiedad"
 
 #: ../gladeui/glade-property-shell.c:125
 msgid "Whether to use the GladeCommand API when modifying properties"
@@ -3176,39 +3201,39 @@ msgstr "Descripción:"
 msgid "program or library short description"
 msgstr "descripción corta del programa o la biblioteca"
 
-#: ../gladeui/glade-project-properties.ui.h:19
+#: ../gladeui/glade-project-properties.ui.h:20
 msgid "GNU GPL version 2"
 msgstr "GNU GPL versión 2"
 
-#: ../gladeui/glade-project-properties.ui.h:20
+#: ../gladeui/glade-project-properties.ui.h:21
 msgid "GNU GPL version 3"
 msgstr "GNU GPL versión 3"
 
-#: ../gladeui/glade-project-properties.ui.h:21
+#: ../gladeui/glade-project-properties.ui.h:22
 msgid "GNU LGPL version 2.1"
 msgstr "GNU LGPL versión 2.1"
 
-#: ../gladeui/glade-project-properties.ui.h:22
+#: ../gladeui/glade-project-properties.ui.h:23
 msgid "GNU LGPL version 3"
 msgstr "GNU LGPL versión 3"
 
-#: ../gladeui/glade-project-properties.ui.h:23
+#: ../gladeui/glade-project-properties.ui.h:24
 msgid "BSD 2-clause"
 msgstr "BSD 2-clause"
 
-#: ../gladeui/glade-project-properties.ui.h:24
+#: ../gladeui/glade-project-properties.ui.h:25
 msgid "BSD 3-clause"
 msgstr "BSD 3-clause"
 
-#: ../gladeui/glade-project-properties.ui.h:25
+#: ../gladeui/glade-project-properties.ui.h:26
 msgid "Apache 2"
 msgstr "Apache 2"
 
-#: ../gladeui/glade-project-properties.ui.h:26
+#: ../gladeui/glade-project-properties.ui.h:27
 msgid "MIT"
 msgstr "MIT"
 
-#: ../gladeui/glade-project-properties.ui.h:27
+#: ../gladeui/glade-project-properties.ui.h:28
 msgid "GNU All permissive"
 msgstr "GNU Permitir todo"
 

po/fr.po

@@ -28,8 +28,8 @@ msgstr ""
 "Project-Id-Version: glade HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=glade&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-03-15 12:07+0000\n"
-"PO-Revision-Date: 2014-03-15 19:44+0100\n"
+"POT-Creation-Date: 2014-03-31 08:50+0000\n"
+"PO-Revision-Date: 2014-03-31 18:16+0200\n"
 "Last-Translator: Julien Hardelin <jhardlin@orange.fr>\n"
 "Language-Team: français <GNOME French Team <gnomefr@traduc.org>>\n"
 "Language: \n"
@@ -68,8 +68,8 @@ msgid ""
 "interfaces for the GTK+ 3 toolkit and the GNOME desktop environment."
 msgstr ""
 "Glade est un outil RAD (Rapid Application Development) qui permet le "
-"développement rapide et facile d'interfaces utilisateur pour la boîte à outils "
-"GTK+ 3 et l'environnement de bureau GNOME."
+"développement rapide et facile d'interfaces utilisateur pour la boîte à "
+"outils GTK+ 3 et l'environnement de bureau GNOME."
 
 #. To translators: AppData description second paragraph
 #: ../data/glade.appdata.xml.in.h:4
@@ -82,8 +82,7 @@ msgstr ""
 "Les interfaces utilisateur conçues dans Glade sont enregistrées en XML. Ces "
 "fichiers peuvent être chargés de façon dynamique selon les besoins grâce à "
 "GtkBuider, ou être utilisées directement pour définir une nouvelle classe "
-"objet dérivée de GtkWidget grâce à la nouvelle fonctionnalité de modèle "
-"GTK+."
+"objet dérivée de GtkWidget grâce à la nouvelle fonctionnalité de modèle GTK+."
 
 #. To translators: AppData description third paragraph
 #: ../data/glade.appdata.xml.in.h:6
@@ -99,194 +98,194 @@ msgstr ""
 msgid "[Read Only]"
 msgstr "[Lecture seule]"
 
-#: ../src/glade-window.c:322
+#: ../src/glade-window.c:323
 msgid "User Interface Designer"
 msgstr "Concepteur d'interface utilisateur"
 
 #. translators: referring to the action of activating a file named '%s'.
 #. *              we also indicate to users that the file may be read-only with
 #. *              the second '%s'
-#: ../src/glade-window.c:523
+#: ../src/glade-window.c:524
 #, c-format
 msgid "Activate '%s' %s"
 msgstr "Activer « %s » %s"
 
 #. translators: referring to the action of activating a file named '%s'
 #. FIXME add hint for translators
-#: ../src/glade-window.c:529 ../src/glade-window.c:537
+#: ../src/glade-window.c:530 ../src/glade-window.c:538
 #, c-format
 msgid "Activate '%s'"
 msgstr "Activer « %s »"
 
 #. Name
-#: ../src/glade-window.c:585 ../src/glade-registration.glade.h:4
+#: ../src/glade-window.c:586 ../src/glade-registration.glade.h:4
 #: ../gladeui/glade-base-editor.c:2030
 #: ../gladeui/glade-project-properties.ui.h:12
 #: ../plugins/gtk+/glade-about-dialog-editor.ui.h:2
 msgid "Name:"
 msgstr "Nom :"
 
-#: ../src/glade-window.c:588
+#: ../src/glade-window.c:589
 msgid "Requires:"
 msgstr "Nécessite :"
 
-#: ../src/glade-window.c:647
+#: ../src/glade-window.c:648
 msgid "_Undo"
 msgstr "_Annuler"
 
-#: ../src/glade-window.c:650
+#: ../src/glade-window.c:651
 #, c-format
 msgid "Undo: %s"
 msgstr "Annule : %s"
 
-#: ../src/glade-window.c:651 ../src/glade-window.c:662
+#: ../src/glade-window.c:652 ../src/glade-window.c:663
 msgid "the last action"
 msgstr "la dernière action"
 
-#: ../src/glade-window.c:658
+#: ../src/glade-window.c:659
 msgid "_Redo"
 msgstr "_Rétablir"
 
-#: ../src/glade-window.c:661
+#: ../src/glade-window.c:662
 #, c-format
 msgid "Redo: %s"
 msgstr "Rétablir : %s"
 
-#: ../src/glade-window.c:693
+#: ../src/glade-window.c:694
 #, c-format
 msgid "Autosaving '%s'"
 msgstr "Enregistrement automatique de « %s »"
 
-#: ../src/glade-window.c:698
+#: ../src/glade-window.c:699
 #, c-format
 msgid "Error autosaving '%s'"
 msgstr "Erreur d'enregistrement automatique de « %s »"
 
-#: ../src/glade-window.c:1117
+#: ../src/glade-window.c:1118
 msgid "Open…"
 msgstr "Ouvrir…"
 
-#: ../src/glade-window.c:1151
+#: ../src/glade-window.c:1152
 #, c-format
 msgid "Project %s is still loading."
 msgstr "Le projet %s est toujours en cours de chargement."
 
-#: ../src/glade-window.c:1170
+#: ../src/glade-window.c:1171
 msgid "Failed to backup existing file, continue saving?"
 msgstr ""
 "Impossible de sauvegarder le fichier existant, poursuivre l'enregistrement ?"
 
-#: ../src/glade-window.c:1192
+#: ../src/glade-window.c:1193
 #, c-format
 msgid "Failed to save %s: %s"
 msgstr "Échec de l'enregistrement de %s : %s"
 
-#: ../src/glade-window.c:1231
+#: ../src/glade-window.c:1232
 #, c-format
 msgid "The file %s has been modified since reading it"
 msgstr "Le fichier %s a été modifié depuis sa lecture"
 
-#: ../src/glade-window.c:1235
+#: ../src/glade-window.c:1236
 msgid "If you save it, all the external changes could be lost. Save it anyway?"
 msgstr ""
 "Si vous l'enregistrez, toutes les modifications externes seront perdues. "
 "Enregistrer quand même ?"
 
-#: ../src/glade-window.c:1240
+#: ../src/glade-window.c:1241
 msgid "_Save Anyway"
 msgstr "_Enregistrer quand même"
 
-#: ../src/glade-window.c:1248
+#: ../src/glade-window.c:1249
 msgid "_Don't Save"
 msgstr "_Ne pas enregistrer"
 
-#: ../src/glade-window.c:1282
+#: ../src/glade-window.c:1283
 #, c-format
 msgid "Project '%s' saved"
 msgstr "Le projet « %s » a été enregistré"
 
-#: ../src/glade-window.c:1313
+#: ../src/glade-window.c:1314
 msgid "Save As…"
 msgstr "Enregistrer sous…"
 
-#: ../src/glade-window.c:1377
+#: ../src/glade-window.c:1378
 #, c-format
 msgid "Could not save the file %s"
 msgstr "Impossible d'enregistrer le fichier %s"
 
-#: ../src/glade-window.c:1381
+#: ../src/glade-window.c:1382
 msgid "You do not have the permissions necessary to save the file."
 msgstr "Vous n'avez pas les permissions requises pour enregistrer le fichier."
 
-#: ../src/glade-window.c:1403
+#: ../src/glade-window.c:1404
 #, c-format
 msgid "Could not save file %s. Another project with that path is open."
 msgstr ""
 "Impossible d'enregistrer le fichier %s. Un autre projet avec ce chemin est "
 "ouvert."
 
-#: ../src/glade-window.c:1428
+#: ../src/glade-window.c:1429
 msgid "No open projects to save"
 msgstr "Aucun projet ouvert à enregistrer"
 
-#: ../src/glade-window.c:1458
+#: ../src/glade-window.c:1459
 #, c-format
 msgid "Save changes to project \"%s\" before closing?"
 msgstr "Enregistrer les modifications du projet « %s » avant de fermer ?"
 
-#: ../src/glade-window.c:1466
+#: ../src/glade-window.c:1467
 msgid "Your changes will be lost if you don't save them."
 msgstr "Vos modifications seront perdues si vous ne les enregistrez pas."
 
-#: ../src/glade-window.c:1470
+#: ../src/glade-window.c:1471
 msgid "Close _without Saving"
 msgstr "_Fermer sans enregistrer"
 
-#: ../src/glade-window.c:1500
+#: ../src/glade-window.c:1501
 msgid "Save…"
 msgstr "Enregistrer…"
 
-#: ../src/glade-window.c:2466
+#: ../src/glade-window.c:2467
 msgid "Close document"
 msgstr "Ferme le document"
 
-#: ../src/glade-window.c:2568
+#: ../src/glade-window.c:2564
 msgid "Could not create a new project."
 msgstr "Impossible de créer un nouveau projet."
 
-#: ../src/glade-window.c:2621
+#: ../src/glade-window.c:2617
 #, c-format
 msgid "The project %s has unsaved changes"
 msgstr "Le projet %s a des modifications non enregistrées"
 
-#: ../src/glade-window.c:2626
+#: ../src/glade-window.c:2622
 msgid "If you reload it, all unsaved changes could be lost. Reload it anyway?"
 msgstr ""
 "Si vous le rechargez, toutes les modifications non enregistrées seront "
 "perdues. Recharger quand même ?"
 
-#: ../src/glade-window.c:2636
+#: ../src/glade-window.c:2632
 #, c-format
 msgid "The project file %s has been externally modified"
 msgstr "Le fichier du projet %s a été modifié extérieurement depuis sa lecture"
 
-#: ../src/glade-window.c:2641
+#: ../src/glade-window.c:2637
 msgid "Do you want to reload the project?"
 msgstr "Voulez-vous recharger le projet ?"
 
-#: ../src/glade-window.c:2647
+#: ../src/glade-window.c:2643
 msgid "_Reload"
 msgstr "_Recharger"
 
-#: ../src/glade-window.c:3216
+#: ../src/glade-window.c:3214
 msgid "Palette"
 msgstr "Palette"
 
-#: ../src/glade-window.c:3218
+#: ../src/glade-window.c:3216
 msgid "Inspector"
 msgstr "Inspecteur"
 
-#: ../src/glade-window.c:3220 ../src/glade.glade.h:33
+#: ../src/glade-window.c:3218 ../src/glade.glade.h:33
 #: ../gladeui/glade-editor.c:320 ../gladeui/glade-widget.c:1385
 #: ../gladeui/glade-project-properties.ui.h:11
 #: ../plugins/gtk+/glade-gtk-action-group.c:177
@@ -299,6 +298,29 @@ msgstr "Inspecteur"
 msgid "Properties"
 msgstr "Propriétés"
 
+#. translators: Primary message of a dialog used to notify the user about the survey
+#: ../src/glade-window.c:3479
+msgid ""
+"We are conducting a user survey\n"
+" would you like to take it now?"
+msgstr ""
+"Nous menons une enquête sur nos utilisateurs\n"
+" voulez-vous participer maintenant ?"
+
+#. translators: Secondary text of a dialog used to notify the user about the survey
+#: ../src/glade-window.c:3483
+msgid "If not, you can always find it in the Help menu."
+msgstr "Sinon, vous pourrez toujours la trouver dans le menu Aide."
+
+#: ../src/glade-window.c:3485
+msgid "_Do not show this dialog again"
+msgstr "_Ne plus afficher cette fenêtre"
+
+#. translators: Text to show in the statusbar if the user did not completed the survey and choose not to show the notification dialog again
+#: ../src/glade-window.c:3506
+msgid "Go to Help -> Registration & User Survey and complete our survey!"
+msgstr "Rendez-vous dans Aide -> Inscription et enquête auprès des utilisateurs, et répondez à l'enquête !"
+
 #: ../src/main.c:51
 msgid "Output version information and exit"
 msgstr "Affiche les informations de version et quitte"
@@ -679,7 +701,7 @@ msgstr "_Récemment ouverts"
 
 #: ../src/glade.glade.h:88
 msgid "Registration & User Survey"
-msgstr "Incription et enquête auprès des utilisateurs"
+msgstr "Inscription et enquête auprès des utilisateurs"
 
 #: ../src/glade.glade.h:89
 msgid "Help us improve Glade by registering and completing the user survey!"
@@ -809,49 +831,49 @@ msgstr "Chemins supplémentaires du catalogue"
 msgid "Select a catalog search path"
 msgstr "Sélectionner un chemin de recherche de catalogue"
 
-#: ../src/glade-registration.c:282
+#: ../src/glade-registration.c:290
 #, c-format
 msgid "Connecting to %s"
 msgstr "Connexion à %s"
 
-#: ../src/glade-registration.c:285
+#: ../src/glade-registration.c:293
 #, c-format
 msgid "Sending data to %s"
 msgstr "Envoi de données à %s"
 
-#: ../src/glade-registration.c:288
+#: ../src/glade-registration.c:296
 #, c-format
 msgid "Waiting for %s"
 msgstr "En attente de %s"
 
-#: ../src/glade-registration.c:291
+#: ../src/glade-registration.c:299
 #, c-format
 msgid "Receiving data from %s"
 msgstr "Réception de données de %s"
 
-#: ../src/glade-registration.c:323
+#: ../src/glade-registration.c:331
 msgid "Sorry, automatic subscription to Glade Users mailing list failed"
 msgstr ""
 "Désolé, l'inscription automatique à la liste de diffusion des utilisateurs "
 "de Glade a échoué."
 
-#: ../src/glade-registration.c:326
+#: ../src/glade-registration.c:334
 msgid "Open Glade Users Website"
 msgstr "Ouvrir la page de la liste de diffusion des utilisateurs"
 
-#: ../src/glade-registration.c:378
+#: ../src/glade-registration.c:386
 msgid "Internal server error"
 msgstr "Erreur de serveur interne"
 
-#: ../src/glade-registration.c:402
+#: ../src/glade-registration.c:410
 msgid "Thank you for taking the time to complete the survey, we appreciate it!"
 msgstr "Merci de prendre le temps de remplir cette enquête. Nous apprécions !"
 
-#: ../src/glade-registration.c:407
+#: ../src/glade-registration.c:418
 msgid "Name and Email fields are required"
 msgstr "Les champs « Nom » et « Adresse électronique » sont obligatoires."
 
-#: ../src/glade-registration.c:410
+#: ../src/glade-registration.c:421
 msgid ""
 "Ops! Email address is already in use!\n"
 "To update information you need to provide the token that was sent to your "
@@ -861,19 +883,19 @@ msgstr ""
 "Pour mettre à jour vos informations, vous devez fournir la clé qui a été "
 "envoyée dans votre boîte aux lettres."
 
-#: ../src/glade-registration.c:413
+#: ../src/glade-registration.c:424
 #, c-format
 msgid "Ops! Error saving user information: %s"
 msgstr ""
 "Oups ! Erreur lors de l'enregistrement des informations concernant "
 "l'utilisateur : %s"
 
-#: ../src/glade-registration.c:416
+#: ../src/glade-registration.c:427
 #, c-format
 msgid "Ops! Error saving survey data: %s"
 msgstr "Oups ! Erreur lors de l'enregistrement des données d'enquête :%s"
 
-#: ../src/glade-registration.c:419
+#: ../src/glade-registration.c:430
 #, c-format
 msgid "Ops! Error accessing DB: %s"
 msgstr "Oups ! Erreur lors de l'accession à la base de données : %s"
@@ -1410,10 +1432,10 @@ msgid ""
 "shared with the public or any other third party."
 msgstr ""
 "L'unique propos de cette enquête est de mieux connaître la base de nos "
-"utilisateurs. Votre adresse électronique n'est utilisée que pour vous identifier "
-"en tant qu'utilisateur de Glade et pour vous envoyer une clé de modification "
-"au cas où vous souhaiteriez modifier quelque chose ou ajouter d'autres "
-"commentaires.\n"
+"utilisateurs. Votre adresse électronique n'est utilisée que pour vous "
+"identifier en tant qu'utilisateur de Glade et pour vous envoyer une clé de "
+"modification au cas où vous souhaiteriez modifier quelque chose ou ajouter "
+"d'autres commentaires.\n"
 "Seules les statistiques tirées de l'ensemble de données seront partagées "
 "publiquement.\n"
 "Les données personnelles sont stockées dans une base de données privée, sans "
@@ -1665,7 +1687,7 @@ msgstr "Définition de plusieurs propriétés"
 msgid "Setting %s of %s"
 msgstr "Configuration de %s pour %s"
 
-#: ../gladeui/glade-command.c:823 ../gladeui/glade-editor-property.c:3350
+#: ../gladeui/glade-command.c:823 ../gladeui/glade-editor-property.c:3355
 #, c-format
 msgid "Setting %s of %s to %s"
 msgstr "Configuration de %s pour %s à %s"
@@ -1959,41 +1981,41 @@ msgstr "Texte personnalisé"
 msgid "Custom Text to display in the property label"
 msgstr "Personnalise le texte à afficher dans l'étiquette de la propriété"
 
-#: ../gladeui/glade-editor-property.c:1262
+#: ../gladeui/glade-editor-property.c:1267
 msgid "Select Fields"
 msgstr "Sélectionner les champs"
 
-#: ../gladeui/glade-editor-property.c:1285
+#: ../gladeui/glade-editor-property.c:1290
 msgid "_Select individual fields:"
 msgstr "_Sélectionner les champs individuels :"
 
-#: ../gladeui/glade-editor-property.c:1635
+#: ../gladeui/glade-editor-property.c:1640
 msgid "Select Named Icon"
 msgstr "Sélectionner une icône nommée"
 
-#: ../gladeui/glade-editor-property.c:1942
+#: ../gladeui/glade-editor-property.c:1947
 msgid "Edit Text"
 msgstr "Éditer le texte"
 
 #. Text
-#: ../gladeui/glade-editor-property.c:1972
+#: ../gladeui/glade-editor-property.c:1977
 msgid "_Text:"
 msgstr "_Texte :"
 
 #. Translatable
-#: ../gladeui/glade-editor-property.c:2008
+#: ../gladeui/glade-editor-property.c:2013
 msgid "T_ranslatable"
 msgstr "T_raduisible"
 
-#: ../gladeui/glade-editor-property.c:2014 ../gladeui/glade-property.c:677
+#: ../gladeui/glade-editor-property.c:2019 ../gladeui/glade-property.c:677
 msgid "Whether this property is translatable"
 msgstr "Indique si la propriété peut être traduite"
 
-#: ../gladeui/glade-editor-property.c:2022
+#: ../gladeui/glade-editor-property.c:2027
 msgid "Conte_xt for translation:"
 msgstr "Conte_xte pour la traduction :"
 
-#: ../gladeui/glade-editor-property.c:2028
+#: ../gladeui/glade-editor-property.c:2033
 msgid ""
 "For short and ambiguous strings: type a word here to differentiate the "
 "meaning of this string from the meaning of other occurrences of the same "
@@ -2003,64 +2025,64 @@ msgstr ""
 "signification de cette chaîne par rapport à d'autres occurrences de la même "
 "chaîne"
 
-#: ../gladeui/glade-editor-property.c:2060
+#: ../gladeui/glade-editor-property.c:2065
 msgid "Co_mments for translators:"
 msgstr "Co_mmentaires pour les traducteurs :"
 
-#: ../gladeui/glade-editor-property.c:2150
+#: ../gladeui/glade-editor-property.c:2155
 msgid "Select a file from the project resource directory"
 msgstr ""
 "Sélectionnez un fichier à partir du répertoire des ressources du projet"
 
 #. GtkInputPurpose enumeration value
-#: ../gladeui/glade-editor-property.c:3018
+#: ../gladeui/glade-editor-property.c:3023
 #: ../gladeui/glade-widget-adaptor.c:1392 ../gladeui/glade-widget.c:1349
 #: ../plugins/gtk+/gtk+.xml.in.h:499
 msgid "Name"
 msgstr "Nom"
 
-#: ../gladeui/glade-editor-property.c:3027 ../gladeui/glade-property.c:644
+#: ../gladeui/glade-editor-property.c:3032 ../gladeui/glade-property.c:644
 msgid "Class"
 msgstr "Classe"
 
-#: ../gladeui/glade-editor-property.c:3047
+#: ../gladeui/glade-editor-property.c:3052
 #, c-format
 msgid "Choose parentless %s type objects in this project"
 msgstr "Choisir des objects de type %s sans parent dans ce projet"
 
-#: ../gladeui/glade-editor-property.c:3049
+#: ../gladeui/glade-editor-property.c:3054
 #, c-format
 msgid "Choose %s type objects in this project"
 msgstr "Choisir des objets de type %s dans ce projet"
 
-#: ../gladeui/glade-editor-property.c:3069
+#: ../gladeui/glade-editor-property.c:3074
 #, c-format
 msgid "Choose a parentless %s in this project"
 msgstr "Choisir un %s sans parent dans ce projet"
 
-#: ../gladeui/glade-editor-property.c:3071
+#: ../gladeui/glade-editor-property.c:3076
 #, c-format
 msgid "Choose a %s in this project"
 msgstr "Choisir un %s pour ce projet"
 
 #. Checklist
-#: ../gladeui/glade-editor-property.c:3128
-#: ../gladeui/glade-editor-property.c:3269
+#: ../gladeui/glade-editor-property.c:3133
+#: ../gladeui/glade-editor-property.c:3274
 msgid "O_bjects:"
 msgstr "O_bjets :"
 
-#: ../gladeui/glade-editor-property.c:3221
+#: ../gladeui/glade-editor-property.c:3226
 msgid "_New"
 msgstr "_Nouveau"
 
 #. translators: Creating 'a widget' for 'a property' of 'a widget'
-#: ../gladeui/glade-editor-property.c:3376
+#: ../gladeui/glade-editor-property.c:3381
 #, c-format
 msgid "Creating %s for %s of %s"
 msgstr "Création de %s pour %s de %s"
 
 #. Checklist
-#: ../gladeui/glade-editor-property.c:3572
+#: ../gladeui/glade-editor-property.c:3577
 msgid "Objects:"
 msgstr "Objets :"
 

po/gl.po

@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glade3-master-po-gl-27110\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-14 18:58+0100\n"
-"PO-Revision-Date: 2014-03-14 19:01+0200\n"
+"POT-Creation-Date: 2014-03-31 23:37+0200\n"
+"PO-Revision-Date: 2014-03-31 23:38+0200\n"
 "Last-Translator: Fran Dieguez <frandieguez@gnome.org>\n"
 "Language-Team: gnome-l10n-gl@gnome.org\n"
 "Language: gl\n"
@@ -82,195 +82,195 @@ msgstr ""
 msgid "[Read Only]"
 msgstr "[Só de lectura]"
 
-#: ../src/glade-window.c:322
+#: ../src/glade-window.c:323
 msgid "User Interface Designer"
 msgstr "Deseñador de interfaces de usuario"
 
 #. translators: referring to the action of activating a file named '%s'.
 #. *              we also indicate to users that the file may be read-only with
 #. *              the second '%s'
-#: ../src/glade-window.c:523
+#: ../src/glade-window.c:524
 #, c-format
 msgid "Activate '%s' %s"
 msgstr "Activar '%s' %s"
 
 #. translators: referring to the action of activating a file named '%s'
 #. FIXME add hint for translators
-#: ../src/glade-window.c:529 ../src/glade-window.c:537
+#: ../src/glade-window.c:530 ../src/glade-window.c:538
 #, c-format
 msgid "Activate '%s'"
 msgstr "Activar '%s'"
 
 #. Name
-#: ../src/glade-window.c:585 ../src/glade-registration.glade.h:4
+#: ../src/glade-window.c:586 ../src/glade-registration.glade.h:4
 #: ../gladeui/glade-base-editor.c:2030
 #: ../gladeui/glade-project-properties.ui.h:12
 #: ../plugins/gtk+/glade-about-dialog-editor.ui.h:2
 msgid "Name:"
 msgstr "Nome:"
 
-#: ../src/glade-window.c:588
+#: ../src/glade-window.c:589
 msgid "Requires:"
 msgstr "Require:"
 
-#: ../src/glade-window.c:647
+#: ../src/glade-window.c:648
 msgid "_Undo"
 msgstr "_Desfacer"
 
-#: ../src/glade-window.c:650
+#: ../src/glade-window.c:651
 #, c-format
 msgid "Undo: %s"
 msgstr "Desfacer: %s"
 
-#: ../src/glade-window.c:651 ../src/glade-window.c:662
+#: ../src/glade-window.c:652 ../src/glade-window.c:663
 msgid "the last action"
 msgstr "a última acción"
 
-#: ../src/glade-window.c:658
+#: ../src/glade-window.c:659
 msgid "_Redo"
 msgstr "_Refacer"
 
-#: ../src/glade-window.c:661
+#: ../src/glade-window.c:662
 #, c-format
 msgid "Redo: %s"
 msgstr "Refacer: %s"
 
-#: ../src/glade-window.c:693
+#: ../src/glade-window.c:694
 #, c-format
 msgid "Autosaving '%s'"
 msgstr "Autogardando «%s»"
 
-#: ../src/glade-window.c:698
+#: ../src/glade-window.c:699
 #, c-format
 msgid "Error autosaving '%s'"
 msgstr "Erro ao autogardar «%s»"
 
-#: ../src/glade-window.c:1117
+#: ../src/glade-window.c:1118
 msgid "Open…"
 msgstr "Abrir…"
 
-#: ../src/glade-window.c:1151
+#: ../src/glade-window.c:1152
 #, c-format
 msgid "Project %s is still loading."
 msgstr "Aínda se está cargando o proxecto «%s»."
 
-#: ../src/glade-window.c:1170
+#: ../src/glade-window.c:1171
 msgid "Failed to backup existing file, continue saving?"
 msgstr ""
 "Produciuse un fallo ao facer un respaldo do ficheiro existente, continuar o "
 "gardado?"
 
-#: ../src/glade-window.c:1192
+#: ../src/glade-window.c:1193
 #, c-format
 msgid "Failed to save %s: %s"
 msgstr "Produciuse un erro ao gardar %s: %s"
 
-#: ../src/glade-window.c:1231
+#: ../src/glade-window.c:1232
 #, c-format
 msgid "The file %s has been modified since reading it"
 msgstr "O ficheiro %s modificouse desde que se leu"
 
-#: ../src/glade-window.c:1235
+#: ../src/glade-window.c:1236
 msgid "If you save it, all the external changes could be lost. Save it anyway?"
 msgstr ""
 "Se o garda, todos os cambios externos poderían perderse. Quere gardalo de "
 "todos os modos?"
 
-#: ../src/glade-window.c:1240
+#: ../src/glade-window.c:1241
 msgid "_Save Anyway"
 msgstr "_Gardar de todos os modos"
 
-#: ../src/glade-window.c:1248
+#: ../src/glade-window.c:1249
 msgid "_Don't Save"
 msgstr "_Non gardar"
 
-#: ../src/glade-window.c:1282
+#: ../src/glade-window.c:1283
 #, c-format
 msgid "Project '%s' saved"
 msgstr "Gardouse o proxecto '%s'"
 
-#: ../src/glade-window.c:1313
+#: ../src/glade-window.c:1314
 msgid "Save As…"
 msgstr "Gardar como…"
 
-#: ../src/glade-window.c:1377
+#: ../src/glade-window.c:1378
 #, c-format
 msgid "Could not save the file %s"
 msgstr "Non foi posíbel gardar o ficheiro %s"
 
-#: ../src/glade-window.c:1381
+#: ../src/glade-window.c:1382
 msgid "You do not have the permissions necessary to save the file."
 msgstr "Non ten os permisos necesarios para gardar o ficheiro."
 
-#: ../src/glade-window.c:1403
+#: ../src/glade-window.c:1404
 #, c-format
 msgid "Could not save file %s. Another project with that path is open."
 msgstr ""
 "Non foi posíbel gardar o ficheiro %s. Está aberto outro proxecto con esa "
 "ruta."
 
-#: ../src/glade-window.c:1428
+#: ../src/glade-window.c:1429
 msgid "No open projects to save"
 msgstr "Non hai proxectos abertos que gardar"
 
-#: ../src/glade-window.c:1458
+#: ../src/glade-window.c:1459
 #, c-format
 msgid "Save changes to project \"%s\" before closing?"
 msgstr "Quere gardar os cambios no proxecto «%s» antes de pechar?"
 
-#: ../src/glade-window.c:1466
+#: ../src/glade-window.c:1467
 msgid "Your changes will be lost if you don't save them."
 msgstr "Os seus cambios perderanse se non os garda."
 
-#: ../src/glade-window.c:1470
+#: ../src/glade-window.c:1471
 msgid "Close _without Saving"
 msgstr "_Pechar sen gardar"
 
-#: ../src/glade-window.c:1500
+#: ../src/glade-window.c:1501
 msgid "Save…"
 msgstr "Gardar…"
 
-#: ../src/glade-window.c:2466
+#: ../src/glade-window.c:2467
 msgid "Close document"
 msgstr "Pechar o documento"
 
-#: ../src/glade-window.c:2568
+#: ../src/glade-window.c:2564
 msgid "Could not create a new project."
 msgstr "Non foi posíbel crear un proxecto novo."
 
-#: ../src/glade-window.c:2621
+#: ../src/glade-window.c:2617
 #, c-format
 msgid "The project %s has unsaved changes"
 msgstr "O proxecto %s ten cambios sen gardar"
 
-#: ../src/glade-window.c:2626
+#: ../src/glade-window.c:2622
 msgid "If you reload it, all unsaved changes could be lost. Reload it anyway?"
 msgstr ""
 "Se o recarga, podería perder todos os cambios sen gardar. Quere recargalo de "
 "todos modos?"
 
-#: ../src/glade-window.c:2636
+#: ../src/glade-window.c:2632
 #, c-format
 msgid "The project file %s has been externally modified"
 msgstr "O ficheiro de proxecto %s modificouse externamente"
 
-#: ../src/glade-window.c:2641
+#: ../src/glade-window.c:2637
 msgid "Do you want to reload the project?"
 msgstr "Quere recargar o proxecto?"
 
-#: ../src/glade-window.c:2647
+#: ../src/glade-window.c:2643
 msgid "_Reload"
 msgstr "_Recargar"
 
-#: ../src/glade-window.c:3216
+#: ../src/glade-window.c:3214
 msgid "Palette"
 msgstr "Paleta"
 
-#: ../src/glade-window.c:3218
+#: ../src/glade-window.c:3216
 msgid "Inspector"
 msgstr "Inspector"
 
-#: ../src/glade-window.c:3220 ../src/glade.glade.h:33
+#: ../src/glade-window.c:3218 ../src/glade.glade.h:33
 #: ../gladeui/glade-editor.c:320 ../gladeui/glade-widget.c:1385
 #: ../gladeui/glade-project-properties.ui.h:11
 #: ../plugins/gtk+/glade-gtk-action-group.c:177
@@ -283,6 +283,30 @@ msgstr "Inspector"
 msgid "Properties"
 msgstr "Propiedades"
 
+#. translators: Primary message of a dialog used to notify the user about the survey
+#: ../src/glade-window.c:3479
+msgid ""
+"We are conducting a user survey\n"
+" would you like to take it now?"
+msgstr ""
+"Estamos levando a cabo unha enquisa de usuarios\n"
+" desexa tomar parte?"
+
+#. translators: Secondary text of a dialog used to notify the user about the survey
+#: ../src/glade-window.c:3483
+msgid "If not, you can always find it in the Help menu."
+msgstr "Se non, sempre pode atopala desde o menú Axuda."
+
+#: ../src/glade-window.c:3485
+msgid "_Do not show this dialog again"
+msgstr "_Non mostrar este diálogo de novo"
+
+#. translators: Text to show in the statusbar if the user did not completed the survey and choose not to show the notification dialog again
+#: ../src/glade-window.c:3506
+msgid "Go to Help -> Registration & User Survey and complete our survey!"
+msgstr ""
+"Vaia a Axuda -> Rexistro e Enquisa de usuarios e complete a nosa enquisa!"
+
 #: ../src/main.c:51
 msgid "Output version information and exit"
 msgstr "Mostrar a información de versión e saír"
@@ -791,47 +815,47 @@ msgstr "Rutas de catálogos adicionais"
 msgid "Select a catalog search path"
 msgstr "Seleccione unha ruta de busca de catálogos"
 
-#: ../src/glade-registration.c:282
+#: ../src/glade-registration.c:290
 #, c-format
 msgid "Connecting to %s"
 msgstr "Conectándose a %s"
 
-#: ../src/glade-registration.c:285
+#: ../src/glade-registration.c:293
 #, c-format
 msgid "Sending data to %s"
 msgstr "Enviando datos a %s"
 
-#: ../src/glade-registration.c:288
+#: ../src/glade-registration.c:296
 #, c-format
 msgid "Waiting for %s"
 msgstr "Agardando por %s"
 
-#: ../src/glade-registration.c:291
+#: ../src/glade-registration.c:299
 #, c-format
 msgid "Receiving data from %s"
 msgstr "Recibindo datos desde %s"
 
-#: ../src/glade-registration.c:323
+#: ../src/glade-registration.c:331
 msgid "Sorry, automatic subscription to Glade Users mailing list failed"
 msgstr "Desculpe, fallou a subscrición automática á lista de usuarios de Glade"
 
-#: ../src/glade-registration.c:326
+#: ../src/glade-registration.c:334
 msgid "Open Glade Users Website"
 msgstr "Abrir o sitio web de usuarios de Glade"
 
-#: ../src/glade-registration.c:378
+#: ../src/glade-registration.c:386
 msgid "Internal server error"
 msgstr "Erro interno do servidor"
 
-#: ../src/glade-registration.c:402
+#: ../src/glade-registration.c:410
 msgid "Thank you for taking the time to complete the survey, we appreciate it!"
 msgstr "Grazas polo tempo de completar a nosa enquisa, agradecémosllo!"
 
-#: ../src/glade-registration.c:407
+#: ../src/glade-registration.c:418
 msgid "Name and Email fields are required"
 msgstr "Requírense os campos do nome e correo electrónico"
 
-#: ../src/glade-registration.c:410
+#: ../src/glade-registration.c:421
 msgid ""
 "Ops! Email address is already in use!\n"
 "To update information you need to provide the token that was sent to your "
@@ -841,17 +865,17 @@ msgstr ""
 "Para actualizar a información debe fornecer o token que lle enviamos ao seu "
 "correo."
 
-#: ../src/glade-registration.c:413
+#: ../src/glade-registration.c:424
 #, c-format
 msgid "Ops! Error saving user information: %s"
 msgstr "Recoiro! Produciuse un erro ao gardar a información do usuario: %s"
 
-#: ../src/glade-registration.c:416
+#: ../src/glade-registration.c:427
 #, c-format
 msgid "Ops! Error saving survey data: %s"
 msgstr "Recoiro! Produciuse un erro ao gardar os datos da enquisa: %s"
 
-#: ../src/glade-registration.c:419
+#: ../src/glade-registration.c:430
 #, c-format
 msgid "Ops! Error accessing DB: %s"
 msgstr "Recoiro! Produciuse un erro ao acceder á base de datos: %s"
@@ -1635,7 +1659,7 @@ msgstr "Definindo múltiples propiedades"
 msgid "Setting %s of %s"
 msgstr "Definindo %s de %s"
 
-#: ../gladeui/glade-command.c:823 ../gladeui/glade-editor-property.c:3350
+#: ../gladeui/glade-command.c:823 ../gladeui/glade-editor-property.c:3355
 #, c-format
 msgid "Setting %s of %s to %s"
 msgstr "Definindo %s de %s a %s"
@@ -1923,41 +1947,41 @@ msgstr "Texto personalizado"
 msgid "Custom Text to display in the property label"
 msgstr "Texto personalizado que mostrar na etiqueta da propiedade"
 
-#: ../gladeui/glade-editor-property.c:1262
+#: ../gladeui/glade-editor-property.c:1267
 msgid "Select Fields"
 msgstr "Seleccionar campos"
 
-#: ../gladeui/glade-editor-property.c:1285
+#: ../gladeui/glade-editor-property.c:1290
 msgid "_Select individual fields:"
 msgstr "_Seleccionar campos individuais:"
 
-#: ../gladeui/glade-editor-property.c:1635
+#: ../gladeui/glade-editor-property.c:1640
 msgid "Select Named Icon"
 msgstr "Seleccione unha icona con nome"
 
-#: ../gladeui/glade-editor-property.c:1942
+#: ../gladeui/glade-editor-property.c:1947
 msgid "Edit Text"
 msgstr "Editar texto"
 
 #. Text
-#: ../gladeui/glade-editor-property.c:1972
+#: ../gladeui/glade-editor-property.c:1977
 msgid "_Text:"
 msgstr "_Texto:"
 
 #. Translatable
-#: ../gladeui/glade-editor-property.c:2008
+#: ../gladeui/glade-editor-property.c:2013
 msgid "T_ranslatable"
 msgstr "T_raducíbel"
 
-#: ../gladeui/glade-editor-property.c:2014 ../gladeui/glade-property.c:677
+#: ../gladeui/glade-editor-property.c:2019 ../gladeui/glade-property.c:677
 msgid "Whether this property is translatable"
 msgstr "Indica se esta propiedade é traducíbel ou non"
 
-#: ../gladeui/glade-editor-property.c:2022
+#: ../gladeui/glade-editor-property.c:2027
 msgid "Conte_xt for translation:"
 msgstr "Conte_xto para a tradución:"
 
-#: ../gladeui/glade-editor-property.c:2028
+#: ../gladeui/glade-editor-property.c:2033
 msgid ""
 "For short and ambiguous strings: type a word here to differentiate the "
 "meaning of this string from the meaning of other occurrences of the same "
@@ -1966,63 +1990,63 @@ msgstr ""
 "Para cadeas curtas ou ambiguas: escriba aquí unha palabra para diferenciar o "
 "significado desta cadea de significado de outras ocorrencias da mesma cadea."
 
-#: ../gladeui/glade-editor-property.c:2060
+#: ../gladeui/glade-editor-property.c:2065
 msgid "Co_mments for translators:"
 msgstr "Co_mentarios para os tradutores:"
 
-#: ../gladeui/glade-editor-property.c:2150
+#: ../gladeui/glade-editor-property.c:2155
 msgid "Select a file from the project resource directory"
 msgstr "Seleccione un ficheiro do directorio de recursos do proxecto"
 
 #. GtkInputPurpose enumeration value
-#: ../gladeui/glade-editor-property.c:3018
+#: ../gladeui/glade-editor-property.c:3023
 #: ../gladeui/glade-widget-adaptor.c:1392 ../gladeui/glade-widget.c:1349
 #: ../plugins/gtk+/gtk+.xml.in.h:499
 msgid "Name"
 msgstr "Nome"
 
-#: ../gladeui/glade-editor-property.c:3027 ../gladeui/glade-property.c:644
+#: ../gladeui/glade-editor-property.c:3032 ../gladeui/glade-property.c:644
 msgid "Class"
 msgstr "Clase"
 
-#: ../gladeui/glade-editor-property.c:3047
+#: ../gladeui/glade-editor-property.c:3052
 #, c-format
 msgid "Choose parentless %s type objects in this project"
 msgstr "Seleccione os obxectos de tipo %s sen parénteses neste proxecto"
 
-#: ../gladeui/glade-editor-property.c:3049
+#: ../gladeui/glade-editor-property.c:3054
 #, c-format
 msgid "Choose %s type objects in this project"
 msgstr "Seleccione os obxectos de tipo %s neste proxecto"
 
-#: ../gladeui/glade-editor-property.c:3069
+#: ../gladeui/glade-editor-property.c:3074
 #, c-format
 msgid "Choose a parentless %s in this project"
 msgstr "Seleccione un %s sen parénteses neste proxecto"
 
-#: ../gladeui/glade-editor-property.c:3071
+#: ../gladeui/glade-editor-property.c:3076
 #, c-format
 msgid "Choose a %s in this project"
 msgstr "Seleccionar un %s neste proxecto"
 
 #. Checklist
-#: ../gladeui/glade-editor-property.c:3128
-#: ../gladeui/glade-editor-property.c:3269
+#: ../gladeui/glade-editor-property.c:3133
+#: ../gladeui/glade-editor-property.c:3274
 msgid "O_bjects:"
 msgstr "O_bxectos:"
 
-#: ../gladeui/glade-editor-property.c:3221
+#: ../gladeui/glade-editor-property.c:3226
 msgid "_New"
 msgstr "_Novo"
 
 #. translators: Creating 'a widget' for 'a property' of 'a widget'
-#: ../gladeui/glade-editor-property.c:3376
+#: ../gladeui/glade-editor-property.c:3381
 #, c-format
 msgid "Creating %s for %s of %s"
 msgstr "Creando %s para %s dun %s"
 
 #. Checklist
-#: ../gladeui/glade-editor-property.c:3572
+#: ../gladeui/glade-editor-property.c:3577
 msgid "Objects:"
 msgstr "Obxectos:"
 
@@ -2325,28 +2349,28 @@ msgstr "Ruta do fornecedor CSS"
 msgid "Path to use as the custom CSS provider for this project."
 msgstr "Ruta a usar para o fornecedor CSS personalizado para este proxecto."
 
-#: ../gladeui/glade-project.c:1126
+#: ../gladeui/glade-project.c:1129
 #, c-format
 msgid "(internal %s)"
 msgstr "(interno %s)"
 
-#: ../gladeui/glade-project.c:1131
+#: ../gladeui/glade-project.c:1134
 #, c-format
 msgid "(%s child)"
 msgstr "(fillo de %s)"
 
-#: ../gladeui/glade-project.c:1133
+#: ../gladeui/glade-project.c:1136
 #, c-format
 msgid "(template)"
 msgstr "(modelo)"
 
 #. translators: refers to a property named '%s' of widget '%s'
-#: ../gladeui/glade-project.c:1141
+#: ../gladeui/glade-project.c:1144
 #, c-format
 msgid "(%s of %s)"
 msgstr "(%s de %s)"
 
-#: ../gladeui/glade-project.c:1499
+#: ../gladeui/glade-project.c:1502
 #, c-format
 msgid ""
 "Failed to load %s.\n"
@@ -2356,28 +2380,28 @@ msgstr ""
 "Os seguintes catálogos requiridos non están dispoñíbeis: %s"
 
 #. translators: refers to project name '%s' that targets gtk version '%d.%d'
-#: ../gladeui/glade-project.c:1870
+#: ../gladeui/glade-project.c:1873
 #, c-format
 msgid "%s targets Gtk+ %d.%d"
 msgstr "%s con obxectivo Gtk+ %d.%d"
 
-#: ../gladeui/glade-project.c:1909
+#: ../gladeui/glade-project.c:1912
 msgid "Specially because there is an object that can not be build with type "
 msgstr ""
 "Especialmente porque existe un obxecto que non poden construírse co tipo "
 
-#: ../gladeui/glade-project.c:1914
+#: ../gladeui/glade-project.c:1917
 #, c-format
 msgid ""
 "Specially because there are %d objects that can not be build with types "
 msgstr ""
 "Especialmente porque existen %d obxectos que non poden construírse cos tipos "
 
-#: ../gladeui/glade-project.c:1921
+#: ../gladeui/glade-project.c:1924
 msgid " and "
 msgstr " e "
 
-#: ../gladeui/glade-project.c:1939
+#: ../gladeui/glade-project.c:1942
 #, c-format
 msgid ""
 "But this version of Glade is for GTK+ 3 only.\n"
@@ -2390,7 +2414,7 @@ msgstr ""
 "widgets obsoletos.\n"
 "%s"
 
-#: ../gladeui/glade-project.c:2000
+#: ../gladeui/glade-project.c:2003
 #, c-format
 msgid ""
 "An automatically saved version of `%s' is more recent.\n"
@@ -2401,7 +2425,7 @@ msgstr ""
 "\n"
 "Desexa cargar a versión gardada?"
 
-#: ../gladeui/glade-project.c:2140
+#: ../gladeui/glade-project.c:2143
 #, c-format
 msgid "%s document properties"
 msgstr "Propiedades do documento %s"
@@ -2414,7 +2438,7 @@ msgstr "Propiedades do documento %s"
 #. * ugly messy code with comments in line breaks inside function calls).
 #.
 #. translators: refers to a widget in toolkit version '%s %d.%d' and a project targeting toolkit version '%s %d.%d'
-#: ../gladeui/glade-project.c:2896
+#: ../gladeui/glade-project.c:2899
 #, c-format
 msgid "This widget was introduced in %s %d.%d while project targets %s %d.%d"
 msgstr ""
@@ -2422,24 +2446,24 @@ msgstr ""
 "%d.%d"
 
 #. translators: refers to a widget '[%s]' introduced in toolkit version '%s %d.%d'
-#: ../gladeui/glade-project.c:2900
+#: ../gladeui/glade-project.c:2903
 #, c-format
 msgid "[%s] Object class '%s' was introduced in %s %d.%d\n"
 msgstr "[%s] A clase de obxecto '%s' foi introducida en %s %d.%d\n"
 
-#: ../gladeui/glade-project.c:2902
+#: ../gladeui/glade-project.c:2905
 msgid "This widget is deprecated"
 msgstr "Este widget está obsoleto"
 
 #. translators: refers to a widget '[%s]' loaded from toolkit version '%s %d.%d'
-#: ../gladeui/glade-project.c:2905
+#: ../gladeui/glade-project.c:2908
 #, c-format
 msgid "[%s] Object class '%s' from %s %d.%d is deprecated\n"
 msgstr "[%s] A clase de obxecto '%s' de %s %d.%d está obsoleta\n"
 
 #. translators: refers to a property in toolkit version '%s %d.%d'
 #. * and a project targeting toolkit version '%s %d.%d'
-#: ../gladeui/glade-project.c:2910
+#: ../gladeui/glade-project.c:2913
 #, c-format
 msgid "This property was introduced in %s %d.%d while project targets %s %d.%d"
 msgstr ""
@@ -2447,14 +2471,14 @@ msgstr ""
 "%s %d.%d"
 
 #. translators: refers to a property '%s' of widget '[%s]' in toolkit version '%s %d.%d'
-#: ../gladeui/glade-project.c:2914
+#: ../gladeui/glade-project.c:2917
 #, c-format
 msgid "[%s] Property '%s' of object class '%s' was introduced in %s %d.%d\n"
 msgstr ""
 "[%s] A propiedade '%s' da clase de obxecto '%s' foi introducida en %s %d.%d\n"
 
 #. translators: refers to a property '%s' of widget '[%s]' in toolkit version '%s %d.%d'
-#: ../gladeui/glade-project.c:2918
+#: ../gladeui/glade-project.c:2921
 #, c-format
 msgid ""
 "[%s] Packing property '%s' of object class '%s' was introduced in %s %d.%d\n"
@@ -2462,19 +2486,19 @@ msgstr ""
 "[%s] A propiedade de empaquetado '%s' da clase de obxecto '%s' foi "
 "introducida en %s %d.%d\n"
 
-#: ../gladeui/glade-project.c:2921
+#: ../gladeui/glade-project.c:2924
 msgid "This property is deprecated"
 msgstr "Esta propiedade é obsoleta"
 
 #. translators: refers to a property '%s' of widget '[%s]'
-#: ../gladeui/glade-project.c:2924
+#: ../gladeui/glade-project.c:2927
 #, c-format
 msgid "[%s] Property '%s' of object class '%s' is deprecated"
 msgstr "[%s] A propiedade '%s' da clase de obxecto '%s' é obsoleta"
 
 #. translators: refers to a signal in toolkit version '%s %d.%d'
 #. * and a project targeting toolkit version '%s %d.%d'
-#: ../gladeui/glade-project.c:2928
+#: ../gladeui/glade-project.c:2931
 #, c-format
 msgid "This signal was introduced in %s %d.%d while project targets %s %d.%d"
 msgstr ""
@@ -2482,78 +2506,78 @@ msgstr ""
 "%d"
 
 #. translators: refers to a signal '%s' of widget '[%s]' in toolkit version '%s %d.%d'
-#: ../gladeui/glade-project.c:2932
+#: ../gladeui/glade-project.c:2935
 #, c-format
 msgid "[%s] Signal '%s' of object class '%s' was introduced in %s %d.%d\n"
 msgstr ""
 "[%s] O sinal '%s' da clase de obxecto '%s' foi introducida en %s %d.%d\n"
 
-#: ../gladeui/glade-project.c:2935
+#: ../gladeui/glade-project.c:2938
 msgid "This signal is deprecated"
 msgstr "Este sinal é obsoleto"
 
 #. translators: refers to a signal '%s' of widget '[%s]'
-#: ../gladeui/glade-project.c:2938
+#: ../gladeui/glade-project.c:2941
 #, c-format
 msgid "[%s] Signal '%s' of object class '%s' is deprecated"
 msgstr "[%s] O sinal '%s' da clase de obxecto '%s' é obsoleto"
 
-#: ../gladeui/glade-project.c:3234
+#: ../gladeui/glade-project.c:3237
 msgid "Details"
 msgstr "Detalles"
 
-#: ../gladeui/glade-project.c:3249
+#: ../gladeui/glade-project.c:3252
 #, c-format
 msgid "Project \"%s\" has errors. Save anyway?"
 msgstr "O proxecto ten «%s» erros. Quere gardalo de todos os modos?"
 
-#: ../gladeui/glade-project.c:3250
+#: ../gladeui/glade-project.c:3253
 #, c-format
 msgid "Project \"%s\" has deprecated widgets and/or version mismatches."
 msgstr ""
 "O proxecto «%s» ten widgets obsoletos e/ou erros de coincidencia entre "
 "versións."
 
-#: ../gladeui/glade-project.c:3277
+#: ../gladeui/glade-project.c:3280
 #, c-format
 msgid "Object %s has unrecognized type %s\n"
 msgstr "O obxecto %s ten un tipo %s non recoñecido\n"
 
-#: ../gladeui/glade-project.c:4747
+#: ../gladeui/glade-project.c:4750
 #, c-format
 msgid "Unsaved %i"
 msgstr "Non gardados %i"
 
-#: ../gladeui/glade-project.c:5046 ../gladeui/glade-project.c:5097
-#: ../gladeui/glade-project.c:5254
+#: ../gladeui/glade-project.c:5049 ../gladeui/glade-project.c:5100
+#: ../gladeui/glade-project.c:5257
 msgid "No widget selected."
 msgstr "Non hai ningún widget seleccionado."
 
-#: ../gladeui/glade-project.c:5062
+#: ../gladeui/glade-project.c:5065
 msgid "Unable to copy unrecognized widget type."
 msgstr "Non foi posíbel copiar o tipo de widget non recoñecido."
 
-#: ../gladeui/glade-project.c:5094
+#: ../gladeui/glade-project.c:5097
 msgid "Unable to cut unrecognized widget type"
 msgstr "Non foi posíbel cortar o tipo de widget non recoñecido."
 
-#: ../gladeui/glade-project.c:5146
+#: ../gladeui/glade-project.c:5149
 msgid "Unable to paste to the selected parent"
 msgstr "Non é posíbel pegar no pai seleccionado"
 
-#: ../gladeui/glade-project.c:5157
+#: ../gladeui/glade-project.c:5160
 msgid "Unable to paste to multiple widgets"
 msgstr "Non é posíbel pegar en múltiples widgets"
 
-#: ../gladeui/glade-project.c:5167
+#: ../gladeui/glade-project.c:5170
 msgid "No widget on the clipboard"
 msgstr "Non hai ningún widget no portaretallos."
 
-#: ../gladeui/glade-project.c:5212
+#: ../gladeui/glade-project.c:5215
 msgid "Only one widget can be pasted at a time to this container"
 msgstr "Só se pode pegar un widget á vez neste contedor"
 
-#: ../gladeui/glade-project.c:5224
+#: ../gladeui/glade-project.c:5227
 msgid "Insufficient amount of placeholders in target container"
 msgstr "O número de marcadores de posición no contedor de destino"
 

po/lt.po

@@ -13,8 +13,8 @@ msgstr ""
 "Project-Id-Version: lt\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=glade&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-03-13 20:12+0000\n"
-"PO-Revision-Date: 2014-03-13 22:52+0200\n"
+"POT-Creation-Date: 2014-03-30 17:59+0000\n"
+"PO-Revision-Date: 2014-03-30 23:05+0300\n"
 "Last-Translator: Aurimas Černius <aurisc4@gmail.com>\n"
 "Language-Team: Lietuvių <gnome-lt@lists.akl.lt>\n"
 "Language: lt\n"
@@ -80,191 +80,191 @@ msgstr ""
 msgid "[Read Only]"
 msgstr "[Tik skaitomas]"
 
-#: ../src/glade-window.c:322
+#: ../src/glade-window.c:323
 msgid "User Interface Designer"
 msgstr "Naudotojo sąsajos projektavimo įrankis"
 
 #. translators: referring to the action of activating a file named '%s'.
 #. *              we also indicate to users that the file may be read-only with
 #. *              the second '%s'
-#: ../src/glade-window.c:523
+#: ../src/glade-window.c:524
 #, c-format
 msgid "Activate '%s' %s"
 msgstr "Aktyvuoti „%s“ %s"
 
 #. translators: referring to the action of activating a file named '%s'
 #. FIXME add hint for translators
-#: ../src/glade-window.c:529 ../src/glade-window.c:537
+#: ../src/glade-window.c:530 ../src/glade-window.c:538
 #, c-format
 msgid "Activate '%s'"
 msgstr "Aktyvuoti „%s“"
 
 #. Name
-#: ../src/glade-window.c:585 ../src/glade-registration.glade.h:4
+#: ../src/glade-window.c:586 ../src/glade-registration.glade.h:4
 #: ../gladeui/glade-base-editor.c:2030
 #: ../gladeui/glade-project-properties.ui.h:12
 #: ../plugins/gtk+/glade-about-dialog-editor.ui.h:2
 msgid "Name:"
 msgstr "Vardas:"
 
-#: ../src/glade-window.c:588
+#: ../src/glade-window.c:589
 msgid "Requires:"
 msgstr "Reikalauja:"
 
-#: ../src/glade-window.c:647
+#: ../src/glade-window.c:648
 msgid "_Undo"
 msgstr "_Atšaukti"
 
-#: ../src/glade-window.c:650
+#: ../src/glade-window.c:651
 #, c-format
 msgid "Undo: %s"
 msgstr "Atšaukti: %s"
 
-#: ../src/glade-window.c:651 ../src/glade-window.c:662
+#: ../src/glade-window.c:652 ../src/glade-window.c:663
 msgid "the last action"
 msgstr "paskutinis veiksmas"
 
-#: ../src/glade-window.c:658
+#: ../src/glade-window.c:659
 msgid "_Redo"
 msgstr "Paka_rtoti"
 
-#: ../src/glade-window.c:661
+#: ../src/glade-window.c:662
 #, c-format
 msgid "Redo: %s"
 msgstr "Pakartoti %s"
 
-#: ../src/glade-window.c:693
+#: ../src/glade-window.c:694
 #, c-format
 msgid "Autosaving '%s'"
 msgstr "Automatiškai įrašoma „%s“"
 
-#: ../src/glade-window.c:698
+#: ../src/glade-window.c:699
 #, c-format
 msgid "Error autosaving '%s'"
 msgstr "Klaida automatiškai įrašant „%s“"
 
-#: ../src/glade-window.c:1117
+#: ../src/glade-window.c:1118
 msgid "Open…"
 msgstr "Atverti…"
 
-#: ../src/glade-window.c:1151
+#: ../src/glade-window.c:1152
 #, c-format
 msgid "Project %s is still loading."
 msgstr "Projektas %s vis dar įkeliamas."
 
-#: ../src/glade-window.c:1170
+#: ../src/glade-window.c:1171
 msgid "Failed to backup existing file, continue saving?"
 msgstr "Nepavyko padaryti failo atsarginės kopijos, tęsti įrašymą?"
 
-#: ../src/glade-window.c:1192
+#: ../src/glade-window.c:1193
 #, c-format
 msgid "Failed to save %s: %s"
 msgstr "Nepavyko išsaugoti %s: %s"
 
-#: ../src/glade-window.c:1231
+#: ../src/glade-window.c:1232
 #, c-format
 msgid "The file %s has been modified since reading it"
 msgstr "Failas %s nuo jo perskaitymo buvo pakeistas"
 
-#: ../src/glade-window.c:1235
+#: ../src/glade-window.c:1236
 msgid "If you save it, all the external changes could be lost. Save it anyway?"
 msgstr ""
 "Jei išsaugosite, visi išoriniai pakeitimai bus prarasti. Vis tiek išsaugoti?"
 
-#: ../src/glade-window.c:1240
+#: ../src/glade-window.c:1241
 msgid "_Save Anyway"
 msgstr "Vis tiek iš_saugoti"
 
-#: ../src/glade-window.c:1248
+#: ../src/glade-window.c:1249
 msgid "_Don't Save"
 msgstr "_Nesaugoti"
 
-#: ../src/glade-window.c:1282
+#: ../src/glade-window.c:1283
 #, c-format
 msgid "Project '%s' saved"
 msgstr "Projektas „%s“ išsaugotas"
 
-#: ../src/glade-window.c:1313
+#: ../src/glade-window.c:1314
 msgid "Save As…"
 msgstr "Išsaugoti kaip…"
 
-#: ../src/glade-window.c:1377
+#: ../src/glade-window.c:1378
 #, c-format
 msgid "Could not save the file %s"
 msgstr "Nepavyko išsaugoti failo %s"
 
-#: ../src/glade-window.c:1381
+#: ../src/glade-window.c:1382
 msgid "You do not have the permissions necessary to save the file."
 msgstr "Neturite reikiamų teisių šiam failui išsaugoti."
 
-#: ../src/glade-window.c:1403
+#: ../src/glade-window.c:1404
 #, c-format
 msgid "Could not save file %s. Another project with that path is open."
 msgstr ""
 "Nepavyko išsaugoti failo %s. Kitas projektas atvertas tame pačiame aplanke."
 
-#: ../src/glade-window.c:1428
+#: ../src/glade-window.c:1429
 msgid "No open projects to save"
 msgstr "Nėra atvertų projektų, kuriuos būtų galima išsaugoti"
 
-#: ../src/glade-window.c:1458
+#: ../src/glade-window.c:1459
 #, c-format
 msgid "Save changes to project \"%s\" before closing?"
 msgstr "Išsaugoti projekto „%s“ pakeitimus prieš uždarant?"
 
-#: ../src/glade-window.c:1466
+#: ../src/glade-window.c:1467
 msgid "Your changes will be lost if you don't save them."
 msgstr "Jūsų pakeitimai bus prarasti, jei jų neišsaugosite."
 
-#: ../src/glade-window.c:1470
+#: ../src/glade-window.c:1471
 msgid "Close _without Saving"
 msgstr "_Užverti neišsaugant"
 
-#: ../src/glade-window.c:1500
+#: ../src/glade-window.c:1501
 msgid "Save…"
 msgstr "Išsaugoti…"
 
-#: ../src/glade-window.c:2466
+#: ../src/glade-window.c:2467
 msgid "Close document"
 msgstr "Užverti dokumentą"
 
-#: ../src/glade-window.c:2568
+#: ../src/glade-window.c:2564
 msgid "Could not create a new project."
 msgstr "Nepavyko sukurti naujo projekto."
 
-#: ../src/glade-window.c:2621
+#: ../src/glade-window.c:2617
 #, c-format
 msgid "The project %s has unsaved changes"
 msgstr "Projekte %s yra neišsaugotų pakeitimų"
 
-#: ../src/glade-window.c:2626
+#: ../src/glade-window.c:2622
 msgid "If you reload it, all unsaved changes could be lost. Reload it anyway?"
 msgstr ""
 "Jei įkelsite iš naujo, visi neišsaugoti pakeitimai bus prarasti. Vis tiek "
 "įkelti iš naujo?"
 
-#: ../src/glade-window.c:2636
+#: ../src/glade-window.c:2632
 #, c-format
 msgid "The project file %s has been externally modified"
 msgstr "Projekto failas %s buvo pakeistas kita programa"
 
-#: ../src/glade-window.c:2641
+#: ../src/glade-window.c:2637
 msgid "Do you want to reload the project?"
 msgstr "Ar norite įkelti projektą iš naujo?"
 
-#: ../src/glade-window.c:2647
+#: ../src/glade-window.c:2643
 msgid "_Reload"
 msgstr "Į_kelti iš naujo"
 
-#: ../src/glade-window.c:3216
+#: ../src/glade-window.c:3214
 msgid "Palette"
 msgstr "Paletė"
 
-#: ../src/glade-window.c:3218
+#: ../src/glade-window.c:3216
 msgid "Inspector"
 msgstr "Valdymo elementai"
 
-#: ../src/glade-window.c:3220 ../src/glade.glade.h:33
+#: ../src/glade-window.c:3218 ../src/glade.glade.h:33
 #: ../gladeui/glade-editor.c:320 ../gladeui/glade-widget.c:1385
 #: ../gladeui/glade-project-properties.ui.h:11
 #: ../plugins/gtk+/glade-gtk-action-group.c:177
@@ -277,6 +277,27 @@ msgstr "Valdymo elementai"
 msgid "Properties"
 msgstr "Savybės"
 
+#: ../src/glade-window.c:3478
+msgid ""
+"We are conducting a user survey\n"
+" would you like to take it now?"
+msgstr ""
+"Šiuo metu darome naudotojų apklausą\n"
+" ar norite dabar ją atlikti?"
+
+#: ../src/glade-window.c:3481
+msgid "If not, you can always find it in the Help menu."
+msgstr "Jei nenorite, visada galite ją rasti Žinyno meniu."
+
+#: ../src/glade-window.c:3483
+msgid "_Do not show this dialog again"
+msgstr "_Daugiau šio dialogo neberodyti"
+
+#: ../src/glade-window.c:3503
+msgid "Go to Help -> Registration & User Survey and complete our survey!"
+msgstr ""
+"Eikite Žinynas -> Registracija ir naudotojo apklausa ir užpildykite apklausą!"
+
 #: ../src/main.c:51
 msgid "Output version information and exit"
 msgstr "Išvesties versijos informacija"
@@ -768,50 +789,50 @@ msgstr "Papildomi katalogų keliai"
 msgid "Select a catalog search path"
 msgstr "Pasirinkite katalogo paieškos kelią"
 
-#: ../src/glade-registration.c:282
+#: ../src/glade-registration.c:290
 #, c-format
 msgid "Connecting to %s"
 msgstr "Jungiamasi prie %s"
 
-#: ../src/glade-registration.c:285
+#: ../src/glade-registration.c:293
 #, c-format
 msgid "Sending data to %s"
 msgstr "Siunčiami duomenys į %s"
 
-#: ../src/glade-registration.c:288
+#: ../src/glade-registration.c:296
 #, c-format
 msgid "Waiting for %s"
 msgstr "Laukiama %s"
 
-#: ../src/glade-registration.c:291
+#: ../src/glade-registration.c:299
 #, c-format
 msgid "Receiving data from %s"
 msgstr "Gaunami duomenys iš %s"
 
-#: ../src/glade-registration.c:323
+#: ../src/glade-registration.c:331
 msgid "Sorry, automatic subscription to Glade Users mailing list failed"
 msgstr ""
 "Atleiskite, nepavyko automatiškai užregistruoti į Glade naudotojų pašto "
 "konferenciją"
 
-#: ../src/glade-registration.c:326
+#: ../src/glade-registration.c:334
 msgid "Open Glade Users Website"
 msgstr "Atverti Glade naudotojų tinklapį"
 
-#: ../src/glade-registration.c:377
+#: ../src/glade-registration.c:386
 msgid "Internal server error"
 msgstr "Vidinė serverio klaida"
 
-#: ../src/glade-registration.c:401
+#: ../src/glade-registration.c:410
 msgid "Thank you for taking the time to complete the survey, we appreciate it!"
 msgstr ""
 "Dėkojame, kad sugaišote laiko ir užpildėte apklausą, labai tai vertiname!"
 
-#: ../src/glade-registration.c:406
+#: ../src/glade-registration.c:418
 msgid "Name and Email fields are required"
 msgstr "Vardo ir el. pašto laukai yra privalomi"
 
-#: ../src/glade-registration.c:409
+#: ../src/glade-registration.c:421
 msgid ""
 "Ops! Email address is already in use!\n"
 "To update information you need to provide the token that was sent to your "
@@ -820,17 +841,17 @@ msgstr ""
 "Oi! El. pašto adresas jau naudojamas!\n"
 "Informacijai atnaujinti reikia pateikti leksemą, kuri buvo atsiųsta jums."
 
-#: ../src/glade-registration.c:412
+#: ../src/glade-registration.c:424
 #, c-format
 msgid "Ops! Error saving user information: %s"
 msgstr "Oi! Klaida įrašant naudotojo informaciją: %s"
 
-#: ../src/glade-registration.c:415
+#: ../src/glade-registration.c:427
 #, c-format
 msgid "Ops! Error saving survey data: %s"
 msgstr "Oi! Klaida įrašant apklausos duomenis: %s"
 
-#: ../src/glade-registration.c:418
+#: ../src/glade-registration.c:430
 #, c-format
 msgid "Ops! Error accessing DB: %s"
 msgstr "Oi! Klaida pasiekiant DB: %s"
@@ -1614,7 +1635,7 @@ msgstr "Nustatomos kelios savybės"
 msgid "Setting %s of %s"
 msgstr "Nustatoma(s) %s objektui %s"
 
-#: ../gladeui/glade-command.c:823 ../gladeui/glade-editor-property.c:3350
+#: ../gladeui/glade-command.c:823 ../gladeui/glade-editor-property.c:3355
 #, c-format
 msgid "Setting %s of %s to %s"
 msgstr "Nustatoma %s (iš %s) į %s"
@@ -1901,41 +1922,41 @@ msgstr "Pasirinktinis tekstas"
 msgid "Custom Text to display in the property label"
 msgstr "Pasirinktinis tekstas savybės etiketei"
 
-#: ../gladeui/glade-editor-property.c:1262
+#: ../gladeui/glade-editor-property.c:1267
 msgid "Select Fields"
 msgstr "Pasirinkite laukus"
 
-#: ../gladeui/glade-editor-property.c:1285
+#: ../gladeui/glade-editor-property.c:1290
 msgid "_Select individual fields:"
 msgstr "Pasirinkite individualius laukus"
 
-#: ../gladeui/glade-editor-property.c:1635
+#: ../gladeui/glade-editor-property.c:1640
 msgid "Select Named Icon"
 msgstr "Pažymėkite piktogramą"
 
-#: ../gladeui/glade-editor-property.c:1942
+#: ../gladeui/glade-editor-property.c:1947
 msgid "Edit Text"
 msgstr "Redaguoti tekstą"
 
 #. Text
-#: ../gladeui/glade-editor-property.c:1972
+#: ../gladeui/glade-editor-property.c:1977
 msgid "_Text:"
 msgstr "_Tekstas:"
 
 #. Translatable
-#: ../gladeui/glade-editor-property.c:2008
+#: ../gladeui/glade-editor-property.c:2013
 msgid "T_ranslatable"
 msgstr "Verčiamas"
 
-#: ../gladeui/glade-editor-property.c:2014 ../gladeui/glade-property.c:677
+#: ../gladeui/glade-editor-property.c:2019 ../gladeui/glade-property.c:677
 msgid "Whether this property is translatable"
 msgstr "Ar pasirinkta savybė gali būti verčiama į kitas kalbas"
 
-#: ../gladeui/glade-editor-property.c:2022
+#: ../gladeui/glade-editor-property.c:2027
 msgid "Conte_xt for translation:"
 msgstr "_Kontekstas vertėjams"
 
-#: ../gladeui/glade-editor-property.c:2028
+#: ../gladeui/glade-editor-property.c:2033
 msgid ""
 "For short and ambiguous strings: type a word here to differentiate the "
 "meaning of this string from the meaning of other occurrences of the same "
@@ -1944,63 +1965,63 @@ msgstr ""
 "Trumpoms ir neaiškioms eilutėms: įveskite čia žodį eilutės prasmės "
 "atskyrimui nuo kitų tos pačios eilutės pasikartojimų prasmių"
 
-#: ../gladeui/glade-editor-property.c:2060
+#: ../gladeui/glade-editor-property.c:2065
 msgid "Co_mments for translators:"
 msgstr "Komentarai vertėjams:"
 
-#: ../gladeui/glade-editor-property.c:2150
+#: ../gladeui/glade-editor-property.c:2155
 msgid "Select a file from the project resource directory"
 msgstr "Pasirinkite failą iš projekto resursų katalogo"
 
 #. GtkInputPurpose enumeration value
-#: ../gladeui/glade-editor-property.c:3018
+#: ../gladeui/glade-editor-property.c:3023
 #: ../gladeui/glade-widget-adaptor.c:1392 ../gladeui/glade-widget.c:1349
 #: ../plugins/gtk+/gtk+.xml.in.h:499
 msgid "Name"
 msgstr "Vardas"
 
-#: ../gladeui/glade-editor-property.c:3027 ../gladeui/glade-property.c:644
+#: ../gladeui/glade-editor-property.c:3032 ../gladeui/glade-property.c:644
 msgid "Class"
 msgstr "Klasė"
 
-#: ../gladeui/glade-editor-property.c:3047
+#: ../gladeui/glade-editor-property.c:3052
 #, c-format
 msgid "Choose parentless %s type objects in this project"
 msgstr "Pasirinkite betėvius %s tipo objektus šiame projekte"
 
-#: ../gladeui/glade-editor-property.c:3049
+#: ../gladeui/glade-editor-property.c:3054
 #, c-format
 msgid "Choose %s type objects in this project"
 msgstr "Pasirinkite %s tipo objektus šiame projekte"
 
-#: ../gladeui/glade-editor-property.c:3069
+#: ../gladeui/glade-editor-property.c:3074
 #, c-format
 msgid "Choose a parentless %s in this project"
 msgstr "Pasirinkite betėvius %s šiame projekte"
 
-#: ../gladeui/glade-editor-property.c:3071
+#: ../gladeui/glade-editor-property.c:3076
 #, c-format
 msgid "Choose a %s in this project"
 msgstr "Pasirinkite %s šiam projektui"
 
 #. Checklist
-#: ../gladeui/glade-editor-property.c:3128
-#: ../gladeui/glade-editor-property.c:3269
+#: ../gladeui/glade-editor-property.c:3133
+#: ../gladeui/glade-editor-property.c:3274
 msgid "O_bjects:"
 msgstr "O_bjektai:"
 
-#: ../gladeui/glade-editor-property.c:3221
+#: ../gladeui/glade-editor-property.c:3226
 msgid "_New"
 msgstr "_Naujas"
 
 #. translators: Creating 'a widget' for 'a property' of 'a widget'
-#: ../gladeui/glade-editor-property.c:3376
+#: ../gladeui/glade-editor-property.c:3381
 #, c-format
 msgid "Creating %s for %s of %s"
 msgstr "Kuriamas %s savybei %s elementui %s"
 
 #. Checklist
-#: ../gladeui/glade-editor-property.c:3572
+#: ../gladeui/glade-editor-property.c:3577
 msgid "Objects:"
 msgstr "Objektai:"
 
@@ -2303,28 +2324,28 @@ msgstr "CSS tiekėjo kelias"
 msgid "Path to use as the custom CSS provider for this project."
 msgstr "Kelias, kurį naudoti kaip pasirinktinio CSS tiekėją šiam projektui."
 
-#: ../gladeui/glade-project.c:1126
+#: ../gladeui/glade-project.c:1129
 #, c-format
 msgid "(internal %s)"
 msgstr "(vidinis %s)"
 
-#: ../gladeui/glade-project.c:1131
+#: ../gladeui/glade-project.c:1134
 #, c-format
 msgid "(%s child)"
 msgstr "(%s antrinis objektas)"
 
-#: ../gladeui/glade-project.c:1133
+#: ../gladeui/glade-project.c:1136
 #, c-format
 msgid "(template)"
 msgstr "(šablonas)"
 
 #. translators: refers to a property named '%s' of widget '%s'
-#: ../gladeui/glade-project.c:1141
+#: ../gladeui/glade-project.c:1144
 #, c-format
 msgid "(%s of %s)"
 msgstr "(%s iš %s)"
 
-#: ../gladeui/glade-project.c:1499
+#: ../gladeui/glade-project.c:1502
 #, c-format
 msgid ""
 "Failed to load %s.\n"
@@ -2334,26 +2355,26 @@ msgstr ""
 "Šie katalogai yra neprieinami: %s"
 
 #. translators: refers to project name '%s' that targets gtk version '%d.%d'
-#: ../gladeui/glade-project.c:1870
+#: ../gladeui/glade-project.c:1873
 #, c-format
 msgid "%s targets Gtk+ %d.%d"
 msgstr "%s skirtas Gtk+ %d.%d"
 
-#: ../gladeui/glade-project.c:1909
+#: ../gladeui/glade-project.c:1912
 msgid "Specially because there is an object that can not be build with type "
 msgstr "Specialiai, kadangi yra objektas, kurio negalima sukurti su tipu"
 
-#: ../gladeui/glade-project.c:1914
+#: ../gladeui/glade-project.c:1917
 #, c-format
 msgid ""
 "Specially because there are %d objects that can not be build with types "
 msgstr "Specialiai, kadangi yra %d objektai, kurių negalima sukurti su tipais"
 
-#: ../gladeui/glade-project.c:1921
+#: ../gladeui/glade-project.c:1924
 msgid " and "
 msgstr " ir "
 
-#: ../gladeui/glade-project.c:1939
+#: ../gladeui/glade-project.c:1942
 #, c-format
 msgid ""
 "But this version of Glade is for GTK+ 3 only.\n"
@@ -2366,7 +2387,7 @@ msgstr ""
 "jokių pasenusių elementų.\n"
 "%s"
 
-#: ../gladeui/glade-project.c:2000
+#: ../gladeui/glade-project.c:2003
 #, c-format
 msgid ""
 "An automatically saved version of `%s' is more recent.\n"
@@ -2377,7 +2398,7 @@ msgstr ""
 "\n"
 "Ar norite vietoj to įkelti automatiškai įrašytą versiją?"
 
-#: ../gladeui/glade-project.c:2140
+#: ../gladeui/glade-project.c:2143
 #, c-format
 msgid "%s document properties"
 msgstr "%s dokumento savybės"
@@ -2390,136 +2411,136 @@ msgstr "%s dokumento savybės"
 #. * ugly messy code with comments in line breaks inside function calls).
 #.
 #. translators: refers to a widget in toolkit version '%s %d.%d' and a project targeting toolkit version '%s %d.%d'
-#: ../gladeui/glade-project.c:2896
+#: ../gladeui/glade-project.c:2899
 #, c-format
 msgid "This widget was introduced in %s %d.%d while project targets %s %d.%d"
 msgstr "Elementas buvo įtrauktas į %s %d.%d, o projektas naudoja %s %d.%d"
 
 #. translators: refers to a widget '[%s]' introduced in toolkit version '%s %d.%d'
-#: ../gladeui/glade-project.c:2900
+#: ../gladeui/glade-project.c:2903
 #, c-format
 msgid "[%s] Object class '%s' was introduced in %s %d.%d\n"
 msgstr "[%s] Objekto klasė '%s' buvo įtraukta į %s %d.%d\n"
 
-#: ../gladeui/glade-project.c:2902
+#: ../gladeui/glade-project.c:2905
 msgid "This widget is deprecated"
 msgstr "Šis valdymo elementas pasenęs"
 
 #. translators: refers to a widget '[%s]' loaded from toolkit version '%s %d.%d'
-#: ../gladeui/glade-project.c:2905
+#: ../gladeui/glade-project.c:2908
 #, c-format
 msgid "[%s] Object class '%s' from %s %d.%d is deprecated\n"
 msgstr "[%s] Objekto klasė '%s' nuo %s %d.%d yra pasenusi\n"
 
 #. translators: refers to a property in toolkit version '%s %d.%d'
 #. * and a project targeting toolkit version '%s %d.%d'
-#: ../gladeui/glade-project.c:2910
+#: ../gladeui/glade-project.c:2913
 #, c-format
 msgid "This property was introduced in %s %d.%d while project targets %s %d.%d"
 msgstr "Ši savybė buvo įtraukta į %s %d.%d, o projektas naudoja %s %d.%d"
 
 #. translators: refers to a property '%s' of widget '[%s]' in toolkit version '%s %d.%d'
-#: ../gladeui/glade-project.c:2914
+#: ../gladeui/glade-project.c:2917
 #, c-format
 msgid "[%s] Property '%s' of object class '%s' was introduced in %s %d.%d\n"
 msgstr "[%s] savybė '%s' objekto klasei '%s' buvo įtraukta į %s %d.%d\n"
 
 #. translators: refers to a property '%s' of widget '[%s]' in toolkit version '%s %d.%d'
-#: ../gladeui/glade-project.c:2918
+#: ../gladeui/glade-project.c:2921
 #, c-format
 msgid ""
 "[%s] Packing property '%s' of object class '%s' was introduced in %s %d.%d\n"
 msgstr ""
 "[%s] pakavimo savybė '%s' objekto klasei '%s' buvo įtraukta į %s %d.%d\n"
 
-#: ../gladeui/glade-project.c:2921
+#: ../gladeui/glade-project.c:2924
 msgid "This property is deprecated"
 msgstr "Ši savybė yra pasenusi"
 
 #. translators: refers to a property '%s' of widget '[%s]'
-#: ../gladeui/glade-project.c:2924
+#: ../gladeui/glade-project.c:2927
 #, c-format
 msgid "[%s] Property '%s' of object class '%s' is deprecated"
 msgstr "[%s] savybė „%s“ objekto klasei „%s“ yra pasenusi"
 
 #. translators: refers to a signal in toolkit version '%s %d.%d'
 #. * and a project targeting toolkit version '%s %d.%d'
-#: ../gladeui/glade-project.c:2928
+#: ../gladeui/glade-project.c:2931
 #, c-format
 msgid "This signal was introduced in %s %d.%d while project targets %s %d.%d"
 msgstr "Signalas buvo įtrauktas į %s %d.%d, o projektas naudoja %s %d.%d"
 
 #. translators: refers to a signal '%s' of widget '[%s]' in toolkit version '%s %d.%d'
-#: ../gladeui/glade-project.c:2932
+#: ../gladeui/glade-project.c:2935
 #, c-format
 msgid "[%s] Signal '%s' of object class '%s' was introduced in %s %d.%d\n"
 msgstr "[%s] signalas '%s' objekto klasei '%s' palaikomas nuo %s %d.%d\n"
 
-#: ../gladeui/glade-project.c:2935
+#: ../gladeui/glade-project.c:2938
 msgid "This signal is deprecated"
 msgstr "Signalas yra pasenęs"
 
 #. translators: refers to a signal '%s' of widget '[%s]'
-#: ../gladeui/glade-project.c:2938
+#: ../gladeui/glade-project.c:2941
 #, c-format
 msgid "[%s] Signal '%s' of object class '%s' is deprecated"
 msgstr "[%s] signalas „%s“ objekto klasei „%s“ yra pasenęs"
 
-#: ../gladeui/glade-project.c:3234
+#: ../gladeui/glade-project.c:3237
 msgid "Details"
 msgstr "Plačiau"
 
-#: ../gladeui/glade-project.c:3249
+#: ../gladeui/glade-project.c:3252
 #, c-format
 msgid "Project \"%s\" has errors. Save anyway?"
 msgstr "Projektas „%s“ turi klaidų. Vistiek išsaugoti?"
 
-#: ../gladeui/glade-project.c:3250
+#: ../gladeui/glade-project.c:3253
 #, c-format
 msgid "Project \"%s\" has deprecated widgets and/or version mismatches."
 msgstr ""
 "Projektas „%s“ turi pasenusių valdymo elementų ir (arba) versijų nesutapimų."
 
-#: ../gladeui/glade-project.c:3277
+#: ../gladeui/glade-project.c:3280
 #, c-format
 msgid "Object %s has unrecognized type %s\n"
 msgstr "Objektas %s yra neatpažinto tipo %s\n"
 
-#: ../gladeui/glade-project.c:4747
+#: ../gladeui/glade-project.c:4750
 #, c-format
 msgid "Unsaved %i"
 msgstr "Neišsaugota %i"
 
-#: ../gladeui/glade-project.c:5046 ../gladeui/glade-project.c:5097
-#: ../gladeui/glade-project.c:5254
+#: ../gladeui/glade-project.c:5049 ../gladeui/glade-project.c:5100
+#: ../gladeui/glade-project.c:5257
 msgid "No widget selected."
 msgstr "Nepasirinktas joks valdymo elementas"
 
-#: ../gladeui/glade-project.c:5062
+#: ../gladeui/glade-project.c:5065
 msgid "Unable to copy unrecognized widget type."
 msgstr "Negalima kopijuoti neatpažinto tipo elemento."
 
-#: ../gladeui/glade-project.c:5094
+#: ../gladeui/glade-project.c:5097
 msgid "Unable to cut unrecognized widget type"
 msgstr "Negalima iškirpti neatpažinto tipo elemento."
 
-#: ../gladeui/glade-project.c:5146
+#: ../gladeui/glade-project.c:5149
 msgid "Unable to paste to the selected parent"
 msgstr "Nepavyko įdėti į pasirinktą pirminį objektą"
 
-#: ../gladeui/glade-project.c:5157
+#: ../gladeui/glade-project.c:5160
 msgid "Unable to paste to multiple widgets"
 msgstr "Nepavyko įdėti kelių valdymo elementų iškart"
 
-#: ../gladeui/glade-project.c:5167
+#: ../gladeui/glade-project.c:5170
 msgid "No widget on the clipboard"
 msgstr "Iškarpinėje nėra valdymo elementų"
 
-#: ../gladeui/glade-project.c:5212
+#: ../gladeui/glade-project.c:5215
 msgid "Only one widget can be pasted at a time to this container"
 msgstr "Tik vienas valdymo elementas gali būti įdėtas į šį konteinerį"
 
-#: ../gladeui/glade-project.c:5224
+#: ../gladeui/glade-project.c:5227
 msgid "Insufficient amount of placeholders in target container"
 msgstr "Nepakankamas vietų skaičius taikinio konteineryje"
 

po/pl.po

@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glade\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-18 00:52+0100\n"
-"PO-Revision-Date: 2014-03-18 00:53+0100\n"
+"POT-Creation-Date: 2014-03-28 15:04+0100\n"
+"PO-Revision-Date: 2014-03-28 15:05+0100\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <gnomepl@aviary.pl>\n"
 "Language: pl\n"
@@ -298,10 +298,10 @@ msgid "If not, you can always find it in the Help menu."
 msgstr "Jeśli nie, to zawsze można ją znaleźć w menu Pomocy."
 
 #: ../src/glade-window.c:3483
-msgid "Do not show this dialog again"
-msgstr "Bez wyświetlania tego okna ponownie"
+msgid "_Do not show this dialog again"
+msgstr "_Bez wyświetlania tego okna ponownie"
 
-#: ../src/glade-window.c:3502
+#: ../src/glade-window.c:3503
 msgid "Go to Help -> Registration & User Survey and complete our survey!"
 msgstr ""
 "Prosimy kliknąć Pomoc -> Rejestracja i ankieta użytkownika i wypełnić naszą "
@@ -1661,7 +1661,7 @@ msgstr "Ustawienie wielu właściwości"
 msgid "Setting %s of %s"
 msgstr "Ustawienie %s dla %s"
 
-#: ../gladeui/glade-command.c:823 ../gladeui/glade-editor-property.c:3350
+#: ../gladeui/glade-command.c:823 ../gladeui/glade-editor-property.c:3355
 #, c-format
 msgid "Setting %s of %s to %s"
 msgstr "Ustawienie %s dla %s na %s"
@@ -1945,41 +1945,41 @@ msgstr "Niestandardowy tekst"
 msgid "Custom Text to display in the property label"
 msgstr "Niestandardowy tekst wyświetlany na etykiecie właściwości"
 
-#: ../gladeui/glade-editor-property.c:1262
+#: ../gladeui/glade-editor-property.c:1267
 msgid "Select Fields"
 msgstr "Wybór pól"
 
-#: ../gladeui/glade-editor-property.c:1285
+#: ../gladeui/glade-editor-property.c:1290
 msgid "_Select individual fields:"
 msgstr "Pro_szę wybrać poszczególne pola:"
 
-#: ../gladeui/glade-editor-property.c:1635
+#: ../gladeui/glade-editor-property.c:1640
 msgid "Select Named Icon"
 msgstr "Wybór nazwanej ikony"
 
-#: ../gladeui/glade-editor-property.c:1942
+#: ../gladeui/glade-editor-property.c:1947
 msgid "Edit Text"
 msgstr "Modyfikowanie tekstu"
 
 #. Text
-#: ../gladeui/glade-editor-property.c:1972
+#: ../gladeui/glade-editor-property.c:1977
 msgid "_Text:"
 msgstr "_Tekst:"
 
 #. Translatable
-#: ../gladeui/glade-editor-property.c:2008
+#: ../gladeui/glade-editor-property.c:2013
 msgid "T_ranslatable"
 msgstr "_Możliwość tłumaczenia"
 
-#: ../gladeui/glade-editor-property.c:2014 ../gladeui/glade-property.c:677
+#: ../gladeui/glade-editor-property.c:2019 ../gladeui/glade-property.c:677
 msgid "Whether this property is translatable"
 msgstr "Określa, czy właściwość może być tłumaczona"
 
-#: ../gladeui/glade-editor-property.c:2022
+#: ../gladeui/glade-editor-property.c:2027
 msgid "Conte_xt for translation:"
 msgstr "_Kontekst dla tłumaczenia:"
 
-#: ../gladeui/glade-editor-property.c:2028
+#: ../gladeui/glade-editor-property.c:2033
 msgid ""
 "For short and ambiguous strings: type a word here to differentiate the "
 "meaning of this string from the meaning of other occurrences of the same "
@@ -1988,63 +1988,63 @@ msgstr ""
 "Dla krótkich i niejednoznacznych ciągów: należy tu wpisać słowo, aby "
 "rozróżnić znaczenie tego ciągu od znaczeń innych wystąpień tego samego ciągu"
 
-#: ../gladeui/glade-editor-property.c:2060
+#: ../gladeui/glade-editor-property.c:2065
 msgid "Co_mments for translators:"
 msgstr "Ko_mentarze dla tłumaczy:"
 
-#: ../gladeui/glade-editor-property.c:2150
+#: ../gladeui/glade-editor-property.c:2155
 msgid "Select a file from the project resource directory"
 msgstr "Wybór pliku z katalogu zasobów projektu"
 
 #. GtkInputPurpose enumeration value
-#: ../gladeui/glade-editor-property.c:3018
+#: ../gladeui/glade-editor-property.c:3023
 #: ../gladeui/glade-widget-adaptor.c:1392 ../gladeui/glade-widget.c:1349
 #: ../plugins/gtk+/gtk+.xml.in.h:499
 msgid "Name"
 msgstr "Nazwa"
 
-#: ../gladeui/glade-editor-property.c:3027 ../gladeui/glade-property.c:644
+#: ../gladeui/glade-editor-property.c:3032 ../gladeui/glade-property.c:644
 msgid "Class"
 msgstr "Klasa"
 
-#: ../gladeui/glade-editor-property.c:3047
+#: ../gladeui/glade-editor-property.c:3052
 #, c-format
 msgid "Choose parentless %s type objects in this project"
 msgstr "Wybór braku nadrzędności obiektów typu %s w tym projekcie"
 
-#: ../gladeui/glade-editor-property.c:3049
+#: ../gladeui/glade-editor-property.c:3054
 #, c-format
 msgid "Choose %s type objects in this project"
 msgstr "Wybór obiektów typu %s w tym projekcie"
 
-#: ../gladeui/glade-editor-property.c:3069
+#: ../gladeui/glade-editor-property.c:3074
 #, c-format
 msgid "Choose a parentless %s in this project"
 msgstr "Wybór braku nadrzędności %s w tym projekcie"
 
-#: ../gladeui/glade-editor-property.c:3071
+#: ../gladeui/glade-editor-property.c:3076
 #, c-format
 msgid "Choose a %s in this project"
 msgstr "Wybór %s w tym projekcie"
 
 #. Checklist
-#: ../gladeui/glade-editor-property.c:3128
-#: ../gladeui/glade-editor-property.c:3269
+#: ../gladeui/glade-editor-property.c:3133
+#: ../gladeui/glade-editor-property.c:3274
 msgid "O_bjects:"
 msgstr "_Obiekty:"
 
-#: ../gladeui/glade-editor-property.c:3221
+#: ../gladeui/glade-editor-property.c:3226
 msgid "_New"
 msgstr "_Nowy"
 
 #. translators: Creating 'a widget' for 'a property' of 'a widget'
-#: ../gladeui/glade-editor-property.c:3376
+#: ../gladeui/glade-editor-property.c:3381
 #, c-format
 msgid "Creating %s for %s of %s"
 msgstr "Tworzenie %s dla %s na %s"
 
 #. Checklist
-#: ../gladeui/glade-editor-property.c:3572
+#: ../gladeui/glade-editor-property.c:3577
 msgid "Objects:"
 msgstr "Obiekty:"
 

po/pt_BR.po

@@ -11,7 +11,7 @@
 # Krix Apolinário <krixapolinario@gmail.com>, 2011
 # Djavan Fagundes <djavan@comum.org>, 2011.
 # Og Maciel <ogmaciel@gnome.org>, 2011.
-# Enrico Nicoletto <liverig@gmail.com>, 2013.
+# Enrico Nicoletto <liverig@gmail.com>, 2013, 2014.
 # Edson Silva <edsonlead@gmail.com>, 2013.
 # Rafael Ferreira <rafael.f.f1@gmail.com>, 2012, 2013, 2014.
 #
@@ -20,16 +20,16 @@ msgstr ""
 "Project-Id-Version: glade\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=glade&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-03-14 14:52+0000\n"
-"PO-Revision-Date: 2014-03-14 11:52-0300\n"
-"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
+"POT-Creation-Date: 2014-03-28 14:51+0000\n"
+"PO-Revision-Date: 2014-03-29 15:03-0300\n"
+"Last-Translator: Enrico Nicoletto <liverig@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 1.6.4\n"
+"X-Generator: Poedit 1.6.3\n"
 
 #: ../data/glade.desktop.in.in.h:1 ../src/main.c:42
 msgid "Glade"
@@ -91,194 +91,194 @@ msgstr ""
 msgid "[Read Only]"
 msgstr "[Somente leitura]"
 
-#: ../src/glade-window.c:322
+#: ../src/glade-window.c:323
 msgid "User Interface Designer"
 msgstr "Construtor de interfaces de usuário"
 
 #. translators: referring to the action of activating a file named '%s'.
 #. *              we also indicate to users that the file may be read-only with
 #. *              the second '%s'
-#: ../src/glade-window.c:523
+#: ../src/glade-window.c:524
 #, c-format
 msgid "Activate '%s' %s"
 msgstr "Ativar \"%s\" %s"
 
 #. translators: referring to the action of activating a file named '%s'
 #. FIXME add hint for translators
-#: ../src/glade-window.c:529 ../src/glade-window.c:537
+#: ../src/glade-window.c:530 ../src/glade-window.c:538
 #, c-format
 msgid "Activate '%s'"
 msgstr "Ativar \"%s\""
 
 #. Name
-#: ../src/glade-window.c:585 ../src/glade-registration.glade.h:4
+#: ../src/glade-window.c:586 ../src/glade-registration.glade.h:4
 #: ../gladeui/glade-base-editor.c:2030
 #: ../gladeui/glade-project-properties.ui.h:12
 #: ../plugins/gtk+/glade-about-dialog-editor.ui.h:2
 msgid "Name:"
 msgstr "Nome:"
 
-#: ../src/glade-window.c:588
+#: ../src/glade-window.c:589
 msgid "Requires:"
 msgstr "Requerimento:"
 
-#: ../src/glade-window.c:647
+#: ../src/glade-window.c:648
 msgid "_Undo"
 msgstr "_Desfazer"
 
-#: ../src/glade-window.c:650
+#: ../src/glade-window.c:651
 #, c-format
 msgid "Undo: %s"
 msgstr "Desfazer: %s"
 
-#: ../src/glade-window.c:651 ../src/glade-window.c:662
+#: ../src/glade-window.c:652 ../src/glade-window.c:663
 msgid "the last action"
 msgstr "a última ação"
 
-#: ../src/glade-window.c:658
+#: ../src/glade-window.c:659
 msgid "_Redo"
 msgstr "_Refazer"
 
-#: ../src/glade-window.c:661
+#: ../src/glade-window.c:662
 #, c-format
 msgid "Redo: %s"
 msgstr "Refazer: %s"
 
-#: ../src/glade-window.c:693
+#: ../src/glade-window.c:694
 #, c-format
 msgid "Autosaving '%s'"
 msgstr "Salvar automaticamente \"%s\""
 
-#: ../src/glade-window.c:698
+#: ../src/glade-window.c:699
 #, c-format
 msgid "Error autosaving '%s'"
 msgstr "Erro ao salvar automaticamente \"%s\""
 
-#: ../src/glade-window.c:1117
+#: ../src/glade-window.c:1118
 msgid "Open…"
 msgstr "Abrir…"
 
-#: ../src/glade-window.c:1151
+#: ../src/glade-window.c:1152
 #, c-format
 msgid "Project %s is still loading."
 msgstr "Projeto %s ainda está carregando."
 
-#: ../src/glade-window.c:1170
+#: ../src/glade-window.c:1171
 msgid "Failed to backup existing file, continue saving?"
 msgstr ""
 "Ocorreu falha ao efetuar backup do arquivo existente, continuar salvando?"
 
-#: ../src/glade-window.c:1192
+#: ../src/glade-window.c:1193
 #, c-format
 msgid "Failed to save %s: %s"
 msgstr "Falha ao salvar %s: %s"
 
-#: ../src/glade-window.c:1231
+#: ../src/glade-window.c:1232
 #, c-format
 msgid "The file %s has been modified since reading it"
 msgstr "O arquivo %s foi modificado desde que foi lido"
 
-#: ../src/glade-window.c:1235
+#: ../src/glade-window.c:1236
 msgid "If you save it, all the external changes could be lost. Save it anyway?"
 msgstr ""
 "Se você salvá-lo, todas as mudanças externas poderão ser perdidas. Você "
 "deseja salvar mesmo assim?"
 
-#: ../src/glade-window.c:1240
+#: ../src/glade-window.c:1241
 msgid "_Save Anyway"
 msgstr "_Salvar mesmo assim"
 
-#: ../src/glade-window.c:1248
+#: ../src/glade-window.c:1249
 msgid "_Don't Save"
 msgstr "_Não salvar"
 
-#: ../src/glade-window.c:1282
+#: ../src/glade-window.c:1283
 #, c-format
 msgid "Project '%s' saved"
 msgstr "Projeto \"%s\" salvo"
 
-#: ../src/glade-window.c:1313
+#: ../src/glade-window.c:1314
 msgid "Save As…"
 msgstr "Salvar como…"
 
-#: ../src/glade-window.c:1377
+#: ../src/glade-window.c:1378
 #, c-format
 msgid "Could not save the file %s"
 msgstr "Não foi possível salvar o arquivo %s"
 
-#: ../src/glade-window.c:1381
+#: ../src/glade-window.c:1382
 msgid "You do not have the permissions necessary to save the file."
 msgstr "Você não tem as permissões necessárias para salvar o arquivo."
 
-#: ../src/glade-window.c:1403
+#: ../src/glade-window.c:1404
 #, c-format
 msgid "Could not save file %s. Another project with that path is open."
 msgstr ""
 "Não foi possível salvar o arquivo %s. Outro projeto com este caminho está "
 "aberto."
 
-#: ../src/glade-window.c:1428
+#: ../src/glade-window.c:1429
 msgid "No open projects to save"
 msgstr "Nenhum projeto aberto para salvar"
 
-#: ../src/glade-window.c:1458
+#: ../src/glade-window.c:1459
 #, c-format
 msgid "Save changes to project \"%s\" before closing?"
 msgstr "Salvar alterações no projeto \"%s\" antes de fechar?"
 
-#: ../src/glade-window.c:1466
+#: ../src/glade-window.c:1467
 msgid "Your changes will be lost if you don't save them."
 msgstr "As suas alterações serão perdidas se você não salvá-las."
 
-#: ../src/glade-window.c:1470
+#: ../src/glade-window.c:1471
 msgid "Close _without Saving"
 msgstr "Fechar _sem salvar"
 
-#: ../src/glade-window.c:1500
+#: ../src/glade-window.c:1501
 msgid "Save…"
 msgstr "Salvar…"
 
-#: ../src/glade-window.c:2466
+#: ../src/glade-window.c:2467
 msgid "Close document"
 msgstr "Fechar documento"
 
-#: ../src/glade-window.c:2568
+#: ../src/glade-window.c:2564
 msgid "Could not create a new project."
 msgstr "Não foi possível criar um novo projeto."
 
-#: ../src/glade-window.c:2621
+#: ../src/glade-window.c:2617
 #, c-format
 msgid "The project %s has unsaved changes"
 msgstr "O projeto %s tem alterações que não foram salvas"
 
-#: ../src/glade-window.c:2626
+#: ../src/glade-window.c:2622
 msgid "If you reload it, all unsaved changes could be lost. Reload it anyway?"
 msgstr ""
 "Se você recarregá-lo todas as mudanças poderão ser perdidas. Você deseja "
 "recarregá-lo mesmo assim?"
 
-#: ../src/glade-window.c:2636
+#: ../src/glade-window.c:2632
 #, c-format
 msgid "The project file %s has been externally modified"
 msgstr "O arquivo %s do projeto foi modificado externamente"
 
-#: ../src/glade-window.c:2641
+#: ../src/glade-window.c:2637
 msgid "Do you want to reload the project?"
 msgstr "Você deseja recarregar o projeto?"
 
-#: ../src/glade-window.c:2647
+#: ../src/glade-window.c:2643
 msgid "_Reload"
 msgstr "_Recarregar"
 
-#: ../src/glade-window.c:3216
+#: ../src/glade-window.c:3214
 msgid "Palette"
 msgstr "Paleta"
 
-#: ../src/glade-window.c:3218
+#: ../src/glade-window.c:3216
 msgid "Inspector"
 msgstr "Inspetor"
 
-#: ../src/glade-window.c:3220 ../src/glade.glade.h:33
+#: ../src/glade-window.c:3218 ../src/glade.glade.h:33
 #: ../gladeui/glade-editor.c:320 ../gladeui/glade-widget.c:1385
 #: ../gladeui/glade-project-properties.ui.h:11
 #: ../plugins/gtk+/glade-gtk-action-group.c:177
@@ -291,6 +291,27 @@ msgstr "Inspetor"
 msgid "Properties"
 msgstr "Propriedades"
 
+#: ../src/glade-window.c:3478
+msgid ""
+"We are conducting a user survey\n"
+" would you like to take it now?"
+msgstr ""
+"Nós estamos realizando uma pesquisa de usuários\n"
+" você gostaria de participar dela agora?"
+
+#: ../src/glade-window.c:3481
+msgid "If not, you can always find it in the Help menu."
+msgstr "Caso não, você sempre pode encontrá-la no menu Ajuda."
+
+#: ../src/glade-window.c:3483
+msgid "_Do not show this dialog again"
+msgstr "_Não mostrar esse diálogo novamente"
+
+#: ../src/glade-window.c:3503
+msgid "Go to Help -> Registration & User Survey and complete our survey!"
+msgstr ""
+"Acesse Ajuda -> Registro & pesquisa de usuários e complete nossa pesquisa!"
+
 #: ../src/main.c:51
 msgid "Output version information and exit"
 msgstr "Exibe informações de versão e sai"
@@ -798,56 +819,50 @@ msgstr "Caminhos de catálogos extra"
 msgid "Select a catalog search path"
 msgstr "Selecione um caminho de pesquisa de catálogos"
 
-#: ../src/glade-registration.c:282
+#: ../src/glade-registration.c:290
 #, c-format
 msgid "Connecting to %s"
 msgstr "Conectando a %s"
 
-#: ../src/glade-registration.c:285
+#: ../src/glade-registration.c:293
 #, c-format
 msgid "Sending data to %s"
 msgstr "Enviando dados para %s"
 
-#: ../src/glade-registration.c:288
+#: ../src/glade-registration.c:296
 #, c-format
 msgid "Waiting for %s"
 msgstr "Esperando por %s"
 
-#: ../src/glade-registration.c:291
+#: ../src/glade-registration.c:299
 #, c-format
 msgid "Receiving data from %s"
 msgstr "Recebendo dados de %s"
 
-#: ../src/glade-registration.c:323
-#| msgid "Sorry, Automatic subscription to Glade-users mailing list failed"
+#: ../src/glade-registration.c:331
 msgid "Sorry, automatic subscription to Glade Users mailing list failed"
 msgstr ""
 "Desculpe, a assinatura automática na lista de e-mails dos usuários do Glade "
 "falhou"
 
-#: ../src/glade-registration.c:326
-#| msgid "Open Glade-users website"
+#: ../src/glade-registration.c:334
 msgid "Open Glade Users Website"
 msgstr "Visitar o site de usuários do Glade"
 
-#: ../src/glade-registration.c:378
+#: ../src/glade-registration.c:386
 msgid "Internal server error"
 msgstr "Erro interno do servidor"
 
-#: ../src/glade-registration.c:402
+#: ../src/glade-registration.c:410
 msgid "Thank you for taking the time to complete the survey, we appreciate it!"
 msgstr ""
 "Obrigado por tomar o tempo para concluir a pesquisa, nós apreciamos isto!"
 
-#: ../src/glade-registration.c:407
+#: ../src/glade-registration.c:418
 msgid "Name and Email fields are required"
 msgstr "Os campos Nome e E-mail são obrigatórios"
 
-#: ../src/glade-registration.c:410
-#| msgid ""
-#| "Ops! email address is already in use!\n"
-#| "To update information you need to provide the token that was sent to your "
-#| "inbox."
+#: ../src/glade-registration.c:421
 msgid ""
 "Ops! Email address is already in use!\n"
 "To update information you need to provide the token that was sent to your "
@@ -857,17 +872,17 @@ msgstr ""
 "Para atualizar a informação você precisa fornecer o token que foi enviado "
 "para sua caixa de entrada."
 
-#: ../src/glade-registration.c:413
+#: ../src/glade-registration.c:424
 #, c-format
 msgid "Ops! Error saving user information: %s"
 msgstr "Ops! Erro ao salvar informação do usuário: %s"
 
-#: ../src/glade-registration.c:416
+#: ../src/glade-registration.c:427
 #, c-format
 msgid "Ops! Error saving survey data: %s"
 msgstr "Ops! Erro ao salvar pesquisa de dados: %s"
 
-#: ../src/glade-registration.c:419
+#: ../src/glade-registration.c:430
 #, c-format
 msgid "Ops! Error accessing DB: %s"
 msgstr "Ops! Erro ao acessar DB: %s"
@@ -1653,7 +1668,7 @@ msgstr "Definindo múltiplas propriedades"
 msgid "Setting %s of %s"
 msgstr "Definindo %s de %s"
 
-#: ../gladeui/glade-command.c:823 ../gladeui/glade-editor-property.c:3350
+#: ../gladeui/glade-command.c:823 ../gladeui/glade-editor-property.c:3355
 #, c-format
 msgid "Setting %s of %s to %s"
 msgstr "Definindo %s de %s para %s"
@@ -1939,41 +1954,41 @@ msgstr "Texto personalizado"
 msgid "Custom Text to display in the property label"
 msgstr "Texto personalizado para exibir no rótulo da propriedade"
 
-#: ../gladeui/glade-editor-property.c:1262
+#: ../gladeui/glade-editor-property.c:1267
 msgid "Select Fields"
 msgstr "Selecionar campos"
 
-#: ../gladeui/glade-editor-property.c:1285
+#: ../gladeui/glade-editor-property.c:1290
 msgid "_Select individual fields:"
 msgstr "_Selecionar campos individuais:"
 
-#: ../gladeui/glade-editor-property.c:1635
+#: ../gladeui/glade-editor-property.c:1640
 msgid "Select Named Icon"
 msgstr "Selecione ícone com nome"
 
-#: ../gladeui/glade-editor-property.c:1942
+#: ../gladeui/glade-editor-property.c:1947
 msgid "Edit Text"
 msgstr "Editar texto"
 
 #. Text
-#: ../gladeui/glade-editor-property.c:1972
+#: ../gladeui/glade-editor-property.c:1977
 msgid "_Text:"
 msgstr "_Texto:"
 
 #. Translatable
-#: ../gladeui/glade-editor-property.c:2008
+#: ../gladeui/glade-editor-property.c:2013
 msgid "T_ranslatable"
 msgstr "T_raduzível"
 
-#: ../gladeui/glade-editor-property.c:2014 ../gladeui/glade-property.c:677
+#: ../gladeui/glade-editor-property.c:2019 ../gladeui/glade-property.c:677
 msgid "Whether this property is translatable"
 msgstr "Se essa propriedade pode ser traduzida ou não"
 
-#: ../gladeui/glade-editor-property.c:2022
+#: ../gladeui/glade-editor-property.c:2027
 msgid "Conte_xt for translation:"
 msgstr "Conte_xto para tradução:"
 
-#: ../gladeui/glade-editor-property.c:2028
+#: ../gladeui/glade-editor-property.c:2033
 msgid ""
 "For short and ambiguous strings: type a word here to differentiate the "
 "meaning of this string from the meaning of other occurrences of the same "
@@ -1983,63 +1998,63 @@ msgstr ""
 "o significado desta expressão do sentido de outras ocorrências da mesma "
 "existente"
 
-#: ../gladeui/glade-editor-property.c:2060
+#: ../gladeui/glade-editor-property.c:2065
 msgid "Co_mments for translators:"
 msgstr "Co_mentário para os tradutores:"
 
-#: ../gladeui/glade-editor-property.c:2150
+#: ../gladeui/glade-editor-property.c:2155
 msgid "Select a file from the project resource directory"
 msgstr "Escolha um arquivo do diretório de recursos do projeto"
 
 #. GtkInputPurpose enumeration value
-#: ../gladeui/glade-editor-property.c:3018
+#: ../gladeui/glade-editor-property.c:3023
 #: ../gladeui/glade-widget-adaptor.c:1392 ../gladeui/glade-widget.c:1349
 #: ../plugins/gtk+/gtk+.xml.in.h:499
 msgid "Name"
 msgstr "Nome"
 
-#: ../gladeui/glade-editor-property.c:3027 ../gladeui/glade-property.c:644
+#: ../gladeui/glade-editor-property.c:3032 ../gladeui/glade-property.c:644
 msgid "Class"
 msgstr "Classe"
 
-#: ../gladeui/glade-editor-property.c:3047
+#: ../gladeui/glade-editor-property.c:3052
 #, c-format
 msgid "Choose parentless %s type objects in this project"
 msgstr "Escolher tipos de objetos %s órfãos neste projeto"
 
-#: ../gladeui/glade-editor-property.c:3049
+#: ../gladeui/glade-editor-property.c:3054
 #, c-format
 msgid "Choose %s type objects in this project"
 msgstr "Escolher tipos de objetos %s neste projeto"
 
-#: ../gladeui/glade-editor-property.c:3069
+#: ../gladeui/glade-editor-property.c:3074
 #, c-format
 msgid "Choose a parentless %s in this project"
 msgstr "Escolher um %s órfão neste projeto"
 
-#: ../gladeui/glade-editor-property.c:3071
+#: ../gladeui/glade-editor-property.c:3076
 #, c-format
 msgid "Choose a %s in this project"
 msgstr "Escolher um %s neste projeto"
 
 #. Checklist
-#: ../gladeui/glade-editor-property.c:3128
-#: ../gladeui/glade-editor-property.c:3269
+#: ../gladeui/glade-editor-property.c:3133
+#: ../gladeui/glade-editor-property.c:3274
 msgid "O_bjects:"
 msgstr "O_bjetos:"
 
-#: ../gladeui/glade-editor-property.c:3221
+#: ../gladeui/glade-editor-property.c:3226
 msgid "_New"
 msgstr "_Novo"
 
 #. translators: Creating 'a widget' for 'a property' of 'a widget'
-#: ../gladeui/glade-editor-property.c:3376
+#: ../gladeui/glade-editor-property.c:3381
 #, c-format
 msgid "Creating %s for %s of %s"
 msgstr "Criando %s para %s de %s"
 
 #. Checklist
-#: ../gladeui/glade-editor-property.c:3572
+#: ../gladeui/glade-editor-property.c:3577
 msgid "Objects:"
 msgstr "Objetos:"
 
@@ -2346,28 +2361,28 @@ msgid "Path to use as the custom CSS provider for this project."
 msgstr ""
 "Caminho a ser usado como o fornecedor de CSS personalizado para este projeto."
 
-#: ../gladeui/glade-project.c:1126
+#: ../gladeui/glade-project.c:1129
 #, c-format
 msgid "(internal %s)"
 msgstr "(%s interno)"
 
-#: ../gladeui/glade-project.c:1131
+#: ../gladeui/glade-project.c:1134
 #, c-format
 msgid "(%s child)"
 msgstr "(%s filho)"
 
-#: ../gladeui/glade-project.c:1133
+#: ../gladeui/glade-project.c:1136
 #, c-format
 msgid "(template)"
 msgstr "(modelo)"
 
 #. translators: refers to a property named '%s' of widget '%s'
-#: ../gladeui/glade-project.c:1141
+#: ../gladeui/glade-project.c:1144
 #, c-format
 msgid "(%s of %s)"
 msgstr "(%s de %s)"
 
-#: ../gladeui/glade-project.c:1499
+#: ../gladeui/glade-project.c:1502
 #, c-format
 msgid ""
 "Failed to load %s.\n"
@@ -2377,18 +2392,18 @@ msgstr ""
 "Os seguintes catálogos necessários não estão disponíveis: %s"
 
 #. translators: refers to project name '%s' that targets gtk version '%d.%d'
-#: ../gladeui/glade-project.c:1870
+#: ../gladeui/glade-project.c:1873
 #, c-format
 msgid "%s targets Gtk+ %d.%d"
 msgstr "%s alvos Gtk+ %d.%d"
 
-#: ../gladeui/glade-project.c:1909
+#: ../gladeui/glade-project.c:1912
 msgid "Specially because there is an object that can not be build with type "
 msgstr ""
 "Especialmente pelo fato de haver um objeto que não pode ser construído com "
 "tipo "
 
-#: ../gladeui/glade-project.c:1914
+#: ../gladeui/glade-project.c:1917
 #, c-format
 msgid ""
 "Specially because there are %d objects that can not be build with types "
@@ -2396,11 +2411,11 @@ msgstr ""
 "Especialmente pelo fato de haverem %d objetos que não podem ser construídos "
 "com tipos "
 
-#: ../gladeui/glade-project.c:1921
+#: ../gladeui/glade-project.c:1924
 msgid " and "
 msgstr " e "
 
-#: ../gladeui/glade-project.c:1939
+#: ../gladeui/glade-project.c:1942
 #, c-format
 msgid ""
 "But this version of Glade is for GTK+ 3 only.\n"
@@ -2413,7 +2428,7 @@ msgstr ""
 "widgets obsoletos.\n"
 "%s"
 
-#: ../gladeui/glade-project.c:2000
+#: ../gladeui/glade-project.c:2003
 #, c-format
 msgid ""
 "An automatically saved version of `%s' is more recent.\n"
@@ -2424,7 +2439,7 @@ msgstr ""
 "\n"
 "Você gostaria de carregar a versão automaticamente salva?"
 
-#: ../gladeui/glade-project.c:2140
+#: ../gladeui/glade-project.c:2143
 #, c-format
 msgid "%s document properties"
 msgstr "Propriedades do documento %s"
@@ -2437,7 +2452,7 @@ msgstr "Propriedades do documento %s"
 #. * ugly messy code with comments in line breaks inside function calls).
 #.
 #. translators: refers to a widget in toolkit version '%s %d.%d' and a project targeting toolkit version '%s %d.%d'
-#: ../gladeui/glade-project.c:2896
+#: ../gladeui/glade-project.c:2899
 #, c-format
 msgid "This widget was introduced in %s %d.%d while project targets %s %d.%d"
 msgstr ""
@@ -2445,24 +2460,24 @@ msgstr ""
 "%s %d.%d"
 
 #. translators: refers to a widget '[%s]' introduced in toolkit version '%s %d.%d'
-#: ../gladeui/glade-project.c:2900
+#: ../gladeui/glade-project.c:2903
 #, c-format
 msgid "[%s] Object class '%s' was introduced in %s %d.%d\n"
 msgstr "[%s] A classe de objeto \"%s\" foi introduzida no %s %d.%d\n"
 
-#: ../gladeui/glade-project.c:2902
+#: ../gladeui/glade-project.c:2905
 msgid "This widget is deprecated"
 msgstr "Este widget está obsoleto"
 
 #. translators: refers to a widget '[%s]' loaded from toolkit version '%s %d.%d'
-#: ../gladeui/glade-project.c:2905
+#: ../gladeui/glade-project.c:2908
 #, c-format
 msgid "[%s] Object class '%s' from %s %d.%d is deprecated\n"
 msgstr "[%s] A classe de objeto \"%s\" de %s %d.%d está obsoleta\n"
 
 #. translators: refers to a property in toolkit version '%s %d.%d'
 #. * and a project targeting toolkit version '%s %d.%d'
-#: ../gladeui/glade-project.c:2910
+#: ../gladeui/glade-project.c:2913
 #, c-format
 msgid "This property was introduced in %s %d.%d while project targets %s %d.%d"
 msgstr ""
@@ -2470,7 +2485,7 @@ msgstr ""
 "baseado no %s %d.%d"
 
 #. translators: refers to a property '%s' of widget '[%s]' in toolkit version '%s %d.%d'
-#: ../gladeui/glade-project.c:2914
+#: ../gladeui/glade-project.c:2917
 #, c-format
 msgid "[%s] Property '%s' of object class '%s' was introduced in %s %d.%d\n"
 msgstr ""
@@ -2478,7 +2493,7 @@ msgstr ""
 "%d.%d\n"
 
 #. translators: refers to a property '%s' of widget '[%s]' in toolkit version '%s %d.%d'
-#: ../gladeui/glade-project.c:2918
+#: ../gladeui/glade-project.c:2921
 #, c-format
 msgid ""
 "[%s] Packing property '%s' of object class '%s' was introduced in %s %d.%d\n"
@@ -2486,19 +2501,19 @@ msgstr ""
 "[%s] A propriedade de empacotamento \"%s\" da classe de objeto \"%s\" foi "
 "introduzida no %s %d.%d\n"
 
-#: ../gladeui/glade-project.c:2921
+#: ../gladeui/glade-project.c:2924
 msgid "This property is deprecated"
 msgstr "Esta propriedade está obsoleta"
 
 #. translators: refers to a property '%s' of widget '[%s]'
-#: ../gladeui/glade-project.c:2924
+#: ../gladeui/glade-project.c:2927
 #, c-format
 msgid "[%s] Property '%s' of object class '%s' is deprecated"
 msgstr "[%s] A propriedade \"%s\" da classe de objeto \"%s\" está obsoleta"
 
 #. translators: refers to a signal in toolkit version '%s %d.%d'
 #. * and a project targeting toolkit version '%s %d.%d'
-#: ../gladeui/glade-project.c:2928
+#: ../gladeui/glade-project.c:2931
 #, c-format
 msgid "This signal was introduced in %s %d.%d while project targets %s %d.%d"
 msgstr ""
@@ -2506,76 +2521,76 @@ msgstr ""
 "%s %d.%d"
 
 #. translators: refers to a signal '%s' of widget '[%s]' in toolkit version '%s %d.%d'
-#: ../gladeui/glade-project.c:2932
+#: ../gladeui/glade-project.c:2935
 #, c-format
 msgid "[%s] Signal '%s' of object class '%s' was introduced in %s %d.%d\n"
 msgstr ""
 "[%s] O sinal \"%s\" da classe de objeto \"%s\" foi introduzido no %s %d.%d\n"
 
-#: ../gladeui/glade-project.c:2935
+#: ../gladeui/glade-project.c:2938
 msgid "This signal is deprecated"
 msgstr "Este sinal está obsoleto"
 
 #. translators: refers to a signal '%s' of widget '[%s]'
-#: ../gladeui/glade-project.c:2938
+#: ../gladeui/glade-project.c:2941
 #, c-format
 msgid "[%s] Signal '%s' of object class '%s' is deprecated"
 msgstr "[%s] O sinal \"%s\" da classe de objeto \"%s\" está obsoleto"
 
-#: ../gladeui/glade-project.c:3234
+#: ../gladeui/glade-project.c:3237
 msgid "Details"
 msgstr "Detalhes"
 
-#: ../gladeui/glade-project.c:3249
+#: ../gladeui/glade-project.c:3252
 #, c-format
 msgid "Project \"%s\" has errors. Save anyway?"
 msgstr "O projeto \"%s\" tem erros. Salvar mesmo assim?"
 
-#: ../gladeui/glade-project.c:3250
+#: ../gladeui/glade-project.c:3253
 #, c-format
 msgid "Project \"%s\" has deprecated widgets and/or version mismatches."
 msgstr "O projeto \"%s\" tem widgets obsoletos e/ou versões que não coincidem."
 
-#: ../gladeui/glade-project.c:3277
+#: ../gladeui/glade-project.c:3280
 #, c-format
 msgid "Object %s has unrecognized type %s\n"
 msgstr "Objeto %s tem tipo %s desconhecido\n"
 
-#: ../gladeui/glade-project.c:4747
+#: ../gladeui/glade-project.c:4750
 #, c-format
 msgid "Unsaved %i"
 msgstr "Não salvo %i"
 
-#: ../gladeui/glade-project.c:5046 ../gladeui/glade-project.c:5097
-#: ../gladeui/glade-project.c:5254
+#: ../gladeui/glade-project.c:5049 ../gladeui/glade-project.c:5100
+#: ../gladeui/glade-project.c:5257
 msgid "No widget selected."
 msgstr "Nenhum widget selecionado."
 
-#: ../gladeui/glade-project.c:5062
+#: ../gladeui/glade-project.c:5065
 msgid "Unable to copy unrecognized widget type."
 msgstr "Não foi possível copiar um tipo de widget desconhecido."
 
-#: ../gladeui/glade-project.c:5094
+#: ../gladeui/glade-project.c:5097
 msgid "Unable to cut unrecognized widget type"
 msgstr "Não foi possível cortar tipo de widget desconhecido"
 
-#: ../gladeui/glade-project.c:5146
+#: ../gladeui/glade-project.c:5149
 msgid "Unable to paste to the selected parent"
 msgstr "Não foi possível colar para o pai selecionado"
 
-#: ../gladeui/glade-project.c:5157
+#: ../gladeui/glade-project.c:5160
 msgid "Unable to paste to multiple widgets"
 msgstr "Não foi possível colar para múltiplos widgets"
 
-#: ../gladeui/glade-project.c:5167
+#: ../gladeui/glade-project.c:5170
 msgid "No widget on the clipboard"
 msgstr "Nenhum widget na área de transferência"
 
-#: ../gladeui/glade-project.c:5212
+#: ../gladeui/glade-project.c:5215
 msgid "Only one widget can be pasted at a time to this container"
 msgstr "Somente um widget pode ser colado por vez para este contêiner"
 
-#: ../gladeui/glade-project.c:5224
+#: ../gladeui/glade-project.c:5227
 msgid "Insufficient amount of placeholders in target container"
 msgstr "Quantidade insuficiente de espaços reservados no contêiner de destino"
 

po/zh_CN.po

@@ -13,15 +13,15 @@ msgstr ""
 "Project-Id-Version: glade3 master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=glade&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-03-09 06:45+0000\n"
-"PO-Revision-Date: 2014-03-08 20:48+0800\n"
-"Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n"
+"POT-Creation-Date: 2014-03-29 07:01+0000\n"
+"PO-Revision-Date: 2014-03-29 15:56+0800\n"
+"Last-Translator: Yunqiang Su <wzssyqa@gmail.com>\n"
 "Language-Team: Chinese (Simplified) <i18n-zh@googlegroups.com>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Gtranslator 2.91.6\n"
+"X-Generator: Poedit 1.6.4\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../data/glade.desktop.in.in.h:1 ../src/main.c:42
@@ -80,187 +80,187 @@ msgstr ""
 msgid "[Read Only]"
 msgstr "[只读]"
 
-#: ../src/glade-window.c:322
+#: ../src/glade-window.c:323
 msgid "User Interface Designer"
 msgstr "用户界面设计器"
 
 #. translators: referring to the action of activating a file named '%s'.
 #. *              we also indicate to users that the file may be read-only with
 #. *              the second '%s'
-#: ../src/glade-window.c:523
+#: ../src/glade-window.c:524
 #, c-format
 msgid "Activate '%s' %s"
 msgstr "激活“%s”%s"
 
 #. translators: referring to the action of activating a file named '%s'
 #. FIXME add hint for translators
-#: ../src/glade-window.c:529 ../src/glade-window.c:537
+#: ../src/glade-window.c:530 ../src/glade-window.c:538
 #, c-format
 msgid "Activate '%s'"
 msgstr "激活“%s”"
 
 #. Name
-#: ../src/glade-window.c:585 ../src/glade-registration.glade.h:4
+#: ../src/glade-window.c:586 ../src/glade-registration.glade.h:4
 #: ../gladeui/glade-base-editor.c:2030
 #: ../gladeui/glade-project-properties.ui.h:12
 #: ../plugins/gtk+/glade-about-dialog-editor.ui.h:2
 msgid "Name:"
 msgstr "名称："
 
-#: ../src/glade-window.c:588
+#: ../src/glade-window.c:589
 msgid "Requires:"
 msgstr "需求："
 
-#: ../src/glade-window.c:647
+#: ../src/glade-window.c:648
 msgid "_Undo"
 msgstr "撤消(_U)"
 
-#: ../src/glade-window.c:650
+#: ../src/glade-window.c:651
 #, c-format
 msgid "Undo: %s"
 msgstr "撤消(_U)：%s"
 
-#: ../src/glade-window.c:651 ../src/glade-window.c:662
+#: ../src/glade-window.c:652 ../src/glade-window.c:663
 msgid "the last action"
 msgstr "上一步操作"
 
-#: ../src/glade-window.c:658
+#: ../src/glade-window.c:659
 msgid "_Redo"
 msgstr "重做(_R)"
 
-#: ../src/glade-window.c:661
+#: ../src/glade-window.c:662
 #, c-format
 msgid "Redo: %s"
 msgstr "重做：%s"
 
-#: ../src/glade-window.c:693
+#: ../src/glade-window.c:694
 #, c-format
 msgid "Autosaving '%s'"
 msgstr "正在自动保存“%s”"
 
-#: ../src/glade-window.c:698
+#: ../src/glade-window.c:699
 #, c-format
 msgid "Error autosaving '%s'"
 msgstr "自动保存“%s”出错"
 
-#: ../src/glade-window.c:1117
+#: ../src/glade-window.c:1118
 msgid "Open…"
 msgstr "打开..."
 
-#: ../src/glade-window.c:1151
+#: ../src/glade-window.c:1152
 #, c-format
 msgid "Project %s is still loading."
 msgstr "项目“%s”仍在加载。"
 
-#: ../src/glade-window.c:1170
+#: ../src/glade-window.c:1171
 msgid "Failed to backup existing file, continue saving?"
 msgstr "备份现存文件失败，继续保存吗？"
 
-#: ../src/glade-window.c:1192
+#: ../src/glade-window.c:1193
 #, c-format
 msgid "Failed to save %s: %s"
 msgstr "保存 %s 失败：%s"
 
-#: ../src/glade-window.c:1231
+#: ../src/glade-window.c:1232
 #, c-format
 msgid "The file %s has been modified since reading it"
 msgstr "文件 %s 相比读取时已修改"
 
-#: ../src/glade-window.c:1235
+#: ../src/glade-window.c:1236
 msgid "If you save it, all the external changes could be lost. Save it anyway?"
 msgstr "如果您保存它，所有的外部修改将丢失。仍然保存吗？"
 
-#: ../src/glade-window.c:1240
+#: ../src/glade-window.c:1241
 msgid "_Save Anyway"
 msgstr "仍然保存(_S)"
 
-#: ../src/glade-window.c:1248
+#: ../src/glade-window.c:1249
 msgid "_Don't Save"
 msgstr "不保存(_D)"
 
-#: ../src/glade-window.c:1282
+#: ../src/glade-window.c:1283
 #, c-format
 msgid "Project '%s' saved"
 msgstr "项目“%s”已保存"
 
-#: ../src/glade-window.c:1313
+#: ../src/glade-window.c:1314
 msgid "Save As…"
 msgstr "另存为..."
 
-#: ../src/glade-window.c:1377
+#: ../src/glade-window.c:1378
 #, c-format
 msgid "Could not save the file %s"
 msgstr "无法保存 %s 文件 "
 
-#: ../src/glade-window.c:1381
+#: ../src/glade-window.c:1382
 msgid "You do not have the permissions necessary to save the file."
 msgstr "您没有保存文件需要的权限。"
 
-#: ../src/glade-window.c:1403
+#: ../src/glade-window.c:1404
 #, c-format
 msgid "Could not save file %s. Another project with that path is open."
 msgstr "无法保存 %s 文件 。另一个打开的项目正在使用该路径。"
 
-#: ../src/glade-window.c:1428
+#: ../src/glade-window.c:1429
 msgid "No open projects to save"
 msgstr "没有已打开的项目可以保存"
 
-#: ../src/glade-window.c:1458
+#: ../src/glade-window.c:1459
 #, c-format
 msgid "Save changes to project \"%s\" before closing?"
 msgstr "在关闭前保存对“%s”项目的修改？"
 
-#: ../src/glade-window.c:1466
+#: ../src/glade-window.c:1467
 msgid "Your changes will be lost if you don't save them."
 msgstr "如果不保存，您的修改将会丢失。"
 
-#: ../src/glade-window.c:1470
+#: ../src/glade-window.c:1471
 msgid "Close _without Saving"
 msgstr "关闭而不保存(_W)"
 
-#: ../src/glade-window.c:1500
+#: ../src/glade-window.c:1501
 msgid "Save…"
 msgstr "保存..."
 
-#: ../src/glade-window.c:2466
+#: ../src/glade-window.c:2467
 msgid "Close document"
 msgstr "关闭文档"
 
-#: ../src/glade-window.c:2568
+#: ../src/glade-window.c:2564
 msgid "Could not create a new project."
 msgstr "无法创建新项目。"
 
-#: ../src/glade-window.c:2621
+#: ../src/glade-window.c:2617
 #, c-format
 msgid "The project %s has unsaved changes"
 msgstr "%s 项目有未保存的更改"
 
-#: ../src/glade-window.c:2626
+#: ../src/glade-window.c:2622
 msgid "If you reload it, all unsaved changes could be lost. Reload it anyway?"
 msgstr "如果重新加载，所有未保存的更改将丢失，确定要重新加载吗？"
 
-#: ../src/glade-window.c:2636
+#: ../src/glade-window.c:2632
 #, c-format
 msgid "The project file %s has been externally modified"
 msgstr "项目文件 %s 已经在外部被修改"
 
-#: ../src/glade-window.c:2641
+#: ../src/glade-window.c:2637
 msgid "Do you want to reload the project?"
 msgstr "您想重新加载该项目吗？"
 
-#: ../src/glade-window.c:2647
+#: ../src/glade-window.c:2643
 msgid "_Reload"
 msgstr "重新加载(_R)"
 
-#: ../src/glade-window.c:3216
+#: ../src/glade-window.c:3214
 msgid "Palette"
 msgstr "调色板"
 
-#: ../src/glade-window.c:3218
+#: ../src/glade-window.c:3216
 msgid "Inspector"
 msgstr "检查器"
 
-#: ../src/glade-window.c:3220 ../src/glade.glade.h:33
+#: ../src/glade-window.c:3218 ../src/glade.glade.h:33
 #: ../gladeui/glade-editor.c:320 ../gladeui/glade-widget.c:1385
 #: ../gladeui/glade-project-properties.ui.h:11
 #: ../plugins/gtk+/glade-gtk-action-group.c:177
@@ -273,6 +273,26 @@ msgstr "检查器"
 msgid "Properties"
 msgstr "属性"
 
+#: ../src/glade-window.c:3478
+msgid ""
+"We are conducting a user survey\n"
+" would you like to take it now?"
+msgstr ""
+"我们在做用户调查\n"
+" 您现在愿意参加吗？"
+
+#: ../src/glade-window.c:3481
+msgid "If not, you can always find it in the Help menu."
+msgstr "如果现在不愿意，您总是可以在帮助菜单中找到它。"
+
+#: ../src/glade-window.c:3483
+msgid "_Do not show this dialog again"
+msgstr "不再显示此对话(_D)"
+
+#: ../src/glade-window.c:3503
+msgid "Go to Help -> Registration & User Survey and complete our survey!"
+msgstr "请到“帮助 -> 注册和用户调查”完成我们的调查！"
+
 #: ../src/main.c:51
 msgid "Output version information and exit"
 msgstr "输出版本信息并退出"
@@ -756,30 +776,70 @@ msgstr "额外的分类路径"
 msgid "Select a catalog search path"
 msgstr "选择一个分类搜索路径"
 
-#: ../src/glade-registration.c:168
+#: ../src/glade-registration.c:290
 #, c-format
 msgid "Connecting to %s"
 msgstr "正在连接 %s"
 
-#: ../src/glade-registration.c:171
+#: ../src/glade-registration.c:293
 #, c-format
 msgid "Sending data to %s"
 msgstr "正在向 %s 发送数据"
 
-#: ../src/glade-registration.c:174
+#: ../src/glade-registration.c:296
 #, c-format
 msgid "Waiting for %s"
 msgstr "正在等待 %s"
 
-#: ../src/glade-registration.c:177
+#: ../src/glade-registration.c:299
 #, c-format
 msgid "Receiving data from %s"
 msgstr "正在从 %s 接收数据"
 
-#: ../src/glade-registration.c:206
+#: ../src/glade-registration.c:331
+msgid "Sorry, automatic subscription to Glade Users mailing list failed"
+msgstr "抱歉，自动订阅 Glade 用户邮件列表失败"
+
+#: ../src/glade-registration.c:334
+msgid "Open Glade Users Website"
+msgstr "打开 Glade 用户网站"
+
+#: ../src/glade-registration.c:386
 msgid "Internal server error"
 msgstr "内部服务器错误"
 
+#: ../src/glade-registration.c:410
+msgid "Thank you for taking the time to complete the survey, we appreciate it!"
+msgstr "感谢参与此调查。我们非常感激！"
+
+#: ../src/glade-registration.c:418
+msgid "Name and Email fields are required"
+msgstr "姓名和电子邮件字段必须填写"
+
+#: ../src/glade-registration.c:421
+msgid ""
+"Ops! Email address is already in use!\n"
+"To update information you need to provide the token that was sent to your "
+"inbox."
+msgstr ""
+"糟糕！电子邮件已在使用！\n"
+"要更新信息，需要提高我们发送到您邮箱的令牌。"
+
+#: ../src/glade-registration.c:424
+#, c-format
+msgid "Ops! Error saving user information: %s"
+msgstr "糟糕！保存用户信息出错：%s"
+
+#: ../src/glade-registration.c:427
+#, c-format
+msgid "Ops! Error saving survey data: %s"
+msgstr "糟糕！保存调查数据出错：%s"
+
+#: ../src/glade-registration.c:430
+#, c-format
+msgid "Ops! Error accessing DB: %s"
+msgstr "糟糕！访问数据库出错：%s"
+
 #: ../src/glade-registration.glade.h:1
 msgid "Glade Registration & User Survey"
 msgstr "Glade 注册和用户调查"
@@ -1545,7 +1605,7 @@ msgstr "设置复合属性"
 msgid "Setting %s of %s"
 msgstr "设置 %2$s 的 %1$s"
 
-#: ../gladeui/glade-command.c:823 ../gladeui/glade-editor-property.c:3350
+#: ../gladeui/glade-command.c:823 ../gladeui/glade-editor-property.c:3355
 #, c-format
 msgid "Setting %s of %s to %s"
 msgstr "将 %2$s 的 %1$s 设置为 %3$s"
@@ -1829,41 +1889,41 @@ msgstr "自定义文本"
 msgid "Custom Text to display in the property label"
 msgstr "显示在属性标签中的自定义文本"
 
-#: ../gladeui/glade-editor-property.c:1262
+#: ../gladeui/glade-editor-property.c:1267
 msgid "Select Fields"
 msgstr "选择区域"
 
-#: ../gladeui/glade-editor-property.c:1285
+#: ../gladeui/glade-editor-property.c:1290
 msgid "_Select individual fields:"
 msgstr "选择独立区域(_S)："
 
-#: ../gladeui/glade-editor-property.c:1635
+#: ../gladeui/glade-editor-property.c:1640
 msgid "Select Named Icon"
 msgstr "选择命名图标"
 
-#: ../gladeui/glade-editor-property.c:1942
+#: ../gladeui/glade-editor-property.c:1947
 msgid "Edit Text"
 msgstr "编辑文本"
 
 #. Text
-#: ../gladeui/glade-editor-property.c:1972
+#: ../gladeui/glade-editor-property.c:1977
 msgid "_Text:"
 msgstr "文本(_T)："
 
 #. Translatable
-#: ../gladeui/glade-editor-property.c:2008
+#: ../gladeui/glade-editor-property.c:2013
 msgid "T_ranslatable"
 msgstr "可译的(_R)"
 
-#: ../gladeui/glade-editor-property.c:2014 ../gladeui/glade-property.c:677
+#: ../gladeui/glade-editor-property.c:2019 ../gladeui/glade-property.c:677
 msgid "Whether this property is translatable"
 msgstr "该属性是否可以翻译"
 
-#: ../gladeui/glade-editor-property.c:2022
+#: ../gladeui/glade-editor-property.c:2027
 msgid "Conte_xt for translation:"
 msgstr "为翻译者写的注释(_X)："
 
-#: ../gladeui/glade-editor-property.c:2028
+#: ../gladeui/glade-editor-property.c:2033
 msgid ""
 "For short and ambiguous strings: type a word here to differentiate the "
 "meaning of this string from the meaning of other occurrences of the same "
@@ -1872,63 +1932,63 @@ msgstr ""
 "简短和模糊的字符串：键入一个词在这里以区别于这个字符串的意思对于其它相同的字"
 "符串的含义"
 
-#: ../gladeui/glade-editor-property.c:2060
+#: ../gladeui/glade-editor-property.c:2065
 msgid "Co_mments for translators:"
 msgstr "翻译者注释(_M)："
 
-#: ../gladeui/glade-editor-property.c:2150
+#: ../gladeui/glade-editor-property.c:2155
 msgid "Select a file from the project resource directory"
 msgstr "从项目资源文件夹中选择一个文件"
 
 #. GtkInputPurpose enumeration value
-#: ../gladeui/glade-editor-property.c:3018
+#: ../gladeui/glade-editor-property.c:3023
 #: ../gladeui/glade-widget-adaptor.c:1392 ../gladeui/glade-widget.c:1349
 #: ../plugins/gtk+/gtk+.xml.in.h:499
 msgid "Name"
 msgstr "名称"
 
-#: ../gladeui/glade-editor-property.c:3027 ../gladeui/glade-property.c:644
+#: ../gladeui/glade-editor-property.c:3032 ../gladeui/glade-property.c:644
 msgid "Class"
 msgstr "类"
 
-#: ../gladeui/glade-editor-property.c:3047
+#: ../gladeui/glade-editor-property.c:3052
 #, c-format
 msgid "Choose parentless %s type objects in this project"
 msgstr "在项目中选择无从属 %s 类型对象"
 
-#: ../gladeui/glade-editor-property.c:3049
+#: ../gladeui/glade-editor-property.c:3054
 #, c-format
 msgid "Choose %s type objects in this project"
 msgstr "选择项目中 %s 类型的对象"
 
-#: ../gladeui/glade-editor-property.c:3069
+#: ../gladeui/glade-editor-property.c:3074
 #, c-format
 msgid "Choose a parentless %s in this project"
 msgstr "选择项目中无从属的 %s "
 
-#: ../gladeui/glade-editor-property.c:3071
+#: ../gladeui/glade-editor-property.c:3076
 #, c-format
 msgid "Choose a %s in this project"
 msgstr "在项目中选择 %s "
 
 #. Checklist
-#: ../gladeui/glade-editor-property.c:3128
-#: ../gladeui/glade-editor-property.c:3269
+#: ../gladeui/glade-editor-property.c:3133
+#: ../gladeui/glade-editor-property.c:3274
 msgid "O_bjects:"
 msgstr "对象(_B)："
 
-#: ../gladeui/glade-editor-property.c:3221
+#: ../gladeui/glade-editor-property.c:3226
 msgid "_New"
 msgstr "新建(_N)"
 
 #. translators: Creating 'a widget' for 'a property' of 'a widget'
-#: ../gladeui/glade-editor-property.c:3376
+#: ../gladeui/glade-editor-property.c:3381
 #, c-format
 msgid "Creating %s for %s of %s"
 msgstr "为 %3$s 的 %2$s 创建 %1$s"
 
 #. Checklist
-#: ../gladeui/glade-editor-property.c:3572
+#: ../gladeui/glade-editor-property.c:3577
 msgid "Objects:"
 msgstr "对象："
 
@@ -2228,28 +2288,28 @@ msgstr "CSS 提供器路径"
 msgid "Path to use as the custom CSS provider for this project."
 msgstr "此项目 CSS 提供器的路径。"
 
-#: ../gladeui/glade-project.c:1126
+#: ../gladeui/glade-project.c:1129
 #, c-format
 msgid "(internal %s)"
 msgstr "(内部的 %s)"
 
-#: ../gladeui/glade-project.c:1131
+#: ../gladeui/glade-project.c:1134
 #, c-format
 msgid "(%s child)"
 msgstr "(%s 子结点)"
 
-#: ../gladeui/glade-project.c:1133
+#: ../gladeui/glade-project.c:1136
 #, c-format
 msgid "(template)"
 msgstr "(模板)"
 
 #. translators: refers to a property named '%s' of widget '%s'
-#: ../gladeui/glade-project.c:1141
+#: ../gladeui/glade-project.c:1144
 #, c-format
 msgid "(%s of %s)"
 msgstr "(%2$s 的 %1$s)"
 
-#: ../gladeui/glade-project.c:1499
+#: ../gladeui/glade-project.c:1502
 #, c-format
 msgid ""
 "Failed to load %s.\n"
@@ -2259,26 +2319,26 @@ msgstr ""
 "以下必需的分类不可用：%s"
 
 #. translators: refers to project name '%s' that targets gtk version '%d.%d'
-#: ../gladeui/glade-project.c:1870
+#: ../gladeui/glade-project.c:1873
 #, c-format
 msgid "%s targets Gtk+ %d.%d"
 msgstr "%s 使用 Gtk+ %d.%d"
 
-#: ../gladeui/glade-project.c:1909
+#: ../gladeui/glade-project.c:1912
 msgid "Specially because there is an object that can not be build with type "
 msgstr "由于有 1 个对象不能使用以下类型构建："
 
-#: ../gladeui/glade-project.c:1914
+#: ../gladeui/glade-project.c:1917
 #, c-format
 msgid ""
 "Specially because there are %d objects that can not be build with types "
 msgstr "由于有 %d 个对象不能使用以下类型构建："
 
-#: ../gladeui/glade-project.c:1921
+#: ../gladeui/glade-project.c:1924
 msgid " and "
 msgstr " 和 "
 
-#: ../gladeui/glade-project.c:1939
+#: ../gladeui/glade-project.c:1942
 #, c-format
 msgid ""
 "But this version of Glade is for GTK+ 3 only.\n"
@@ -2290,7 +2350,7 @@ msgstr ""
 "请先确定此项目不使用废弃的组件便能运行于 Glade 3.8 上。\n"
 "%s"
 
-#: ../gladeui/glade-project.c:2000
+#: ../gladeui/glade-project.c:2003
 #, c-format
 msgid ""
 "An automatically saved version of `%s' is more recent.\n"
@@ -2300,7 +2360,7 @@ msgstr ""
 "有一份“%s”自动保存的版本比它新。\n"
 "您是否愿意转而加载自动保存的版本？"
 
-#: ../gladeui/glade-project.c:2140
+#: ../gladeui/glade-project.c:2143
 #, c-format
 msgid "%s document properties"
 msgstr "%s 文档属性"
@@ -2313,134 +2373,134 @@ msgstr "%s 文档属性"
 #. * ugly messy code with comments in line breaks inside function calls).
 #.
 #. translators: refers to a widget in toolkit version '%s %d.%d' and a project targeting toolkit version '%s %d.%d'
-#: ../gladeui/glade-project.c:2896
+#: ../gladeui/glade-project.c:2899
 #, c-format
 msgid "This widget was introduced in %s %d.%d while project targets %s %d.%d"
 msgstr "这个组件在 %s %d.%d 中被引入，而项目目标是 %s %d.%d"
 
 #. translators: refers to a widget '[%s]' introduced in toolkit version '%s %d.%d'
-#: ../gladeui/glade-project.c:2900
+#: ../gladeui/glade-project.c:2903
 #, c-format
 msgid "[%s] Object class '%s' was introduced in %s %d.%d\n"
 msgstr "[%s] 对象类“%s”在 %s %d.%d 中被引入\n"
 
-#: ../gladeui/glade-project.c:2902
+#: ../gladeui/glade-project.c:2905
 msgid "This widget is deprecated"
 msgstr "该组件已被废弃"
 
 #. translators: refers to a widget '[%s]' loaded from toolkit version '%s %d.%d'
-#: ../gladeui/glade-project.c:2905
+#: ../gladeui/glade-project.c:2908
 #, c-format
 msgid "[%s] Object class '%s' from %s %d.%d is deprecated\n"
 msgstr "[%s] 对象类“%s”来自于 %s %d.%d 已不推荐使用\n"
 
 #. translators: refers to a property in toolkit version '%s %d.%d'
 #. * and a project targeting toolkit version '%s %d.%d'
-#: ../gladeui/glade-project.c:2910
+#: ../gladeui/glade-project.c:2913
 #, c-format
 msgid "This property was introduced in %s %d.%d while project targets %s %d.%d"
 msgstr "该属性在 %s %d.%d 中被引入，而项目目标为 %s %d.%d"
 
 #. translators: refers to a property '%s' of widget '[%s]' in toolkit version '%s %d.%d'
-#: ../gladeui/glade-project.c:2914
+#: ../gladeui/glade-project.c:2917
 #, c-format
 msgid "[%s] Property '%s' of object class '%s' was introduced in %s %d.%d\n"
 msgstr "[%s] 属性“%s”于对象类“%s”在 %s %d.%d 中被引入\n"
 
 #. translators: refers to a property '%s' of widget '[%s]' in toolkit version '%s %d.%d'
-#: ../gladeui/glade-project.c:2918
+#: ../gladeui/glade-project.c:2921
 #, c-format
 msgid ""
 "[%s] Packing property '%s' of object class '%s' was introduced in %s %d.%d\n"
 msgstr "[%s] 包装属性“%s”于对象类“%s”在 %s %d.%d 中被引入\n"
 
-#: ../gladeui/glade-project.c:2921
+#: ../gladeui/glade-project.c:2924
 msgid "This property is deprecated"
 msgstr "该属性已弃用"
 
 #. translators: refers to a property '%s' of widget '[%s]'
-#: ../gladeui/glade-project.c:2924
+#: ../gladeui/glade-project.c:2927
 #, c-format
 msgid "[%s] Property '%s' of object class '%s' is deprecated"
 msgstr "[%1$s] 对象类“%3$s”的属性“%2$s”已弃用"
 
 #. translators: refers to a signal in toolkit version '%s %d.%d'
 #. * and a project targeting toolkit version '%s %d.%d'
-#: ../gladeui/glade-project.c:2928
+#: ../gladeui/glade-project.c:2931
 #, c-format
 msgid "This signal was introduced in %s %d.%d while project targets %s %d.%d"
 msgstr "信号在 %s %d.%d 被引入，而项目目标为 %s %d.%d"
 
 #. translators: refers to a signal '%s' of widget '[%s]' in toolkit version '%s %d.%d'
-#: ../gladeui/glade-project.c:2932
+#: ../gladeui/glade-project.c:2935
 #, c-format
 msgid "[%s] Signal '%s' of object class '%s' was introduced in %s %d.%d\n"
 msgstr "[%s] 信号“%s”于对象类“%s”在 %s %d.%d 被引入\n"
 
-#: ../gladeui/glade-project.c:2935
+#: ../gladeui/glade-project.c:2938
 msgid "This signal is deprecated"
 msgstr "该信号已弃用"
 
 #. translators: refers to a signal '%s' of widget '[%s]'
-#: ../gladeui/glade-project.c:2938
+#: ../gladeui/glade-project.c:2941
 #, c-format
 msgid "[%s] Signal '%s' of object class '%s' is deprecated"
 msgstr "[%1$s] 对象类“%3$s”的信号“%2$s”已被弃用"
 
-#: ../gladeui/glade-project.c:3234
+#: ../gladeui/glade-project.c:3237
 msgid "Details"
 msgstr "细节"
 
-#: ../gladeui/glade-project.c:3249
+#: ../gladeui/glade-project.c:3252
 #, c-format
 msgid "Project \"%s\" has errors. Save anyway?"
 msgstr "项目“%s”有错误。仍然保存？"
 
-#: ../gladeui/glade-project.c:3250
+#: ../gladeui/glade-project.c:3253
 #, c-format
 msgid "Project \"%s\" has deprecated widgets and/or version mismatches."
 msgstr "项目“%s”包含有废弃的组件和/或版本不匹配。"
 
-#: ../gladeui/glade-project.c:3277
+#: ../gladeui/glade-project.c:3280
 #, c-format
 msgid "Object %s has unrecognized type %s\n"
 msgstr "对象 %s 为无法识别的类型 %s\n"
 
-#: ../gladeui/glade-project.c:4747
+#: ../gladeui/glade-project.c:4750
 #, c-format
 msgid "Unsaved %i"
 msgstr "未保存的 %i"
 
-#: ../gladeui/glade-project.c:5046 ../gladeui/glade-project.c:5097
-#: ../gladeui/glade-project.c:5254
+#: ../gladeui/glade-project.c:5049 ../gladeui/glade-project.c:5100
+#: ../gladeui/glade-project.c:5257
 msgid "No widget selected."
 msgstr "未选择组件。"
 
-#: ../gladeui/glade-project.c:5062
+#: ../gladeui/glade-project.c:5065
 msgid "Unable to copy unrecognized widget type."
 msgstr "无法复制不识别的组件类。"
 
-#: ../gladeui/glade-project.c:5094
+#: ../gladeui/glade-project.c:5097
 msgid "Unable to cut unrecognized widget type"
 msgstr "无法剪切不识别的组件类"
 
-#: ../gladeui/glade-project.c:5146
+#: ../gladeui/glade-project.c:5149
 msgid "Unable to paste to the selected parent"
 msgstr "无法粘贴到上一级"
 
-#: ../gladeui/glade-project.c:5157
+#: ../gladeui/glade-project.c:5160
 msgid "Unable to paste to multiple widgets"
 msgstr "无法粘贴到多个组件"
 
-#: ../gladeui/glade-project.c:5167
+#: ../gladeui/glade-project.c:5170
 msgid "No widget on the clipboard"
 msgstr "剪贴板上没有组件"
 
-#: ../gladeui/glade-project.c:5212
+#: ../gladeui/glade-project.c:5215
 msgid "Only one widget can be pasted at a time to this container"
 msgstr "在该容器中每次只能粘贴一个组件"
 
-#: ../gladeui/glade-project.c:5224
+#: ../gladeui/glade-project.c:5227
 msgid "Insufficient amount of placeholders in target container"
 msgstr "目标容器中没有足够的放置位置"
 

src/Makefile.am

@@ -37,7 +37,8 @@ noinst_HEADERS = \
 	glade-resources.h \
 	glade-preferences.h \
 	glade-logo.h \
-	glade-registration.h
+	glade-registration.h \
+	glade-http.h
 
 # Generate resources
 glade-resources.h: glade-resources.gresource.xml $(UI_FILES)

src/glade-http.c

@@ -62,7 +62,7 @@ enum
 static GParamSpec *properties[N_PROPERTIES];
 static guint http_signals[LAST_SIGNAL] = { 0 };
 
-G_DEFINE_TYPE (GladeHTTP, glade_http, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_PRIVATE (GladeHTTP, glade_http, G_TYPE_OBJECT);
 
 static void
 glade_http_emit_request_done (GladeHTTP *http, gchar *response)
@@ -133,11 +133,12 @@ static void
 on_read_ready (GObject *source, GAsyncResult *res, gpointer data)
 {
   GladeHTTPPrivate *priv = GLADE_HTTP (data)->priv;
+  GError *error = NULL;
   gssize bytes_read;
 
   glade_http_emit_status (data, GLADE_HTTP_RECEIVING, NULL);
 
-  bytes_read = g_input_stream_read_finish (G_INPUT_STREAM (source), res, NULL);
+  bytes_read = g_input_stream_read_finish (G_INPUT_STREAM (source), res, &error);
   
   if (bytes_read > 0)
     {
@@ -157,8 +158,8 @@ on_read_ready (GObject *source, GAsyncResult *res, gpointer data)
     }
   else if (bytes_read < 0)
     {
-      /* Read error */
-      g_message ("g_input_stream_read_finish error");
+      glade_http_emit_status (data, GLADE_HTTP_ERROR, error);
+      g_error_free (error);
       return;
     }
 
@@ -176,6 +177,11 @@ on_write_ready (GObject *source, GAsyncResult *res, gpointer data)
 
   count = g_output_stream_write_finish (G_OUTPUT_STREAM (source), res, &error);
 
+  if (error == NULL && priv->data->len != count)
+    error = g_error_new (G_IO_ERROR, G_IO_ERROR_FAILED, 
+                         "Error sending data data to %s", 
+                         priv->host);
+
   if (error)
     {
       glade_http_emit_status (data, GLADE_HTTP_ERROR, error);
@@ -183,12 +189,6 @@ on_write_ready (GObject *source, GAsyncResult *res, gpointer data)
       return;
     }
 
-  if (priv->data->len != count)
-    {
-      g_warning ("priv->data_size = %ld, write = %ld", priv->data->len, count);
-      return;
-    }
-
   glade_http_emit_status (data, GLADE_HTTP_WAITING, NULL);
   g_input_stream_read_async (g_io_stream_get_input_stream (G_IO_STREAM (priv->connection)),
                              priv->response_buffer, HTTP_BUFFER_SIZE,
@@ -224,7 +224,7 @@ glade_http_init (GladeHTTP *http)
 {
   GladeHTTPPrivate *priv;
   
-  priv = http->priv = G_TYPE_INSTANCE_GET_PRIVATE (http, GLADE_TYPE_HTTP, GladeHTTPPrivate);
+  priv = http->priv = glade_http_get_instance_private (http);
 
   priv->data = g_string_new ("");
   priv->response = g_string_new ("");
@@ -316,8 +316,6 @@ glade_http_class_init (GladeHTTPClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (GladeHTTPPrivate));
-
   object_class->finalize = glade_http_finalize;
   object_class->set_property = glade_http_set_property;
   object_class->get_property = glade_http_get_property;
@@ -377,7 +375,7 @@ glade_http_get_host (GladeHTTP *http)
 gint
 glade_http_get_port (GladeHTTP *http)
 {
-  g_return_val_if_fail (GLADE_IS_HTTP (http), NULL);
+  g_return_val_if_fail (GLADE_IS_HTTP (http), 0);
   return http->priv->port;
 }
 

src/glade-http.h

@@ -82,7 +82,7 @@ gint         glade_http_get_port         (GladeHTTP    *http);
 void         glade_http_request_send_async (GladeHTTP    *http,
                                             GCancellable *cancellable,
                                             const gchar  *format,
-                                            ...);
+                                            ...) G_GNUC_PRINTF (3, 4);
 G_END_DECLS
 
 #endif /* _GLADE_HTTP_H_ */

src/glade-registration.c

@@ -26,6 +26,8 @@
 #include <gladeui/glade.h>
 #include <glib/gi18n.h>
 
+#define CONFIG_GROUP             "User & Survey"
+
 struct _GladeRegistrationPrivate
 {
   GtkWidget    *infobar;
@@ -100,6 +102,12 @@ struct _GladeRegistrationPrivate
 
 G_DEFINE_TYPE_WITH_PRIVATE (GladeRegistration, glade_registration, GTK_TYPE_DIALOG);
 
+enum 
+{
+  PROP_0,
+  PROP_COMPLETED,
+  PROP_SKIP_REMINDER
+};
 
 static void
 string_append_input_key_value_tuple (GString *string,
@@ -141,6 +149,12 @@ string_append_input_key_value_tuple (GString *string,
     g_string_append_printf (string, "%d", gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (input)) ? 1 : 0);
 }
 
+static void
+glade_registration_show_message (GladeRegistration *registration,
+                                 GtkMessageType     type,
+                                 const gchar       *format,
+                                 ...) G_GNUC_PRINTF (3, 4);
+
 static void
 glade_registration_show_message (GladeRegistration *registration,
                                  GtkMessageType     type,
@@ -250,7 +264,7 @@ glade_registration_http_post (GladeRegistration *registration,
                                  "Accept: text/plain\r\n"
                                  "Accept-Language: %s\r\n"
                                  "Content-Type: application/x-www-form-urlencoded\r\n"
-                                 "Content-Length: %d\r\n"
+                                 "Content-Length: %"G_GSIZE_FORMAT"\r\n"
                                  "\r\n%s",
                                  url,                                                       /* POST url */
                                  glade_http_get_host (http),                                /* Host */
@@ -401,6 +415,9 @@ on_http_request_done (GladeHTTP         *http,
               glade_util_ui_message (GTK_WIDGET (registration), GLADE_UI_INFO, NULL,
                                      "<big>%s</big>", _("Thank you for taking the time to complete the survey, we appreciate it!"));
               gtk_widget_hide (GTK_WIDGET (registration));
+
+              g_object_set (registration, "completed", TRUE, NULL);
+              glade_app_config_save ();
             }
           else if (g_strcmp0 (status, "error_required_field") == 0)
             glade_registration_show_message (registration, GTK_MESSAGE_INFO,
@@ -519,7 +536,7 @@ on_registration_dialog_response (GtkDialog *dialog, gint response_id)
   glade_registration_http_post (GLADE_REGISTRATION (dialog),
                                 priv->http,
                                 priv->cancellable,
-                                "/~jpu/glade/registration_master.php",
+                                "/~jpu/glade/registration.php",
                                 post);
   
   g_string_free (post, TRUE);
@@ -644,6 +661,42 @@ glade_registration_finalize (GObject *object)
   G_OBJECT_CLASS (glade_registration_parent_class)->finalize (object);
 }
 
+static void
+glade_registration_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
+{
+  GKeyFile *config = glade_app_get_config ();
+  g_return_if_fail (GLADE_IS_REGISTRATION (object));
+
+  switch (prop_id)
+    {
+      case PROP_SKIP_REMINDER:
+      case PROP_COMPLETED:
+        g_key_file_set_boolean (config, CONFIG_GROUP, pspec->name, g_value_get_boolean (value));
+        break;
+      default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+        break;
+    }
+}
+
+static void
+glade_registration_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
+{
+  GKeyFile *config = glade_app_get_config ();
+  g_return_if_fail (GLADE_IS_REGISTRATION (object));
+
+  switch (prop_id)
+    {
+      case PROP_SKIP_REMINDER:
+      case PROP_COMPLETED:
+        g_value_set_boolean (value, g_key_file_get_boolean (config, CONFIG_GROUP, pspec->name, NULL));
+        break;
+      default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+        break;
+    }
+}
+
 static void
 glade_registration_class_init (GladeRegistrationClass *klass)
 {
@@ -722,6 +775,24 @@ glade_registration_class_init (GladeRegistrationClass *klass)
   gtk_widget_class_bind_template_callback (widget_class, on_viewport_draw);
   
   object_class->finalize = glade_registration_finalize;
+  object_class->set_property = glade_registration_set_property;
+  object_class->get_property = glade_registration_get_property;
+
+  g_object_class_install_property (object_class,
+                                   PROP_COMPLETED,
+                                   g_param_spec_boolean ("completed",
+                                                         "Completed",
+                                                         "Registration was completed successfully",
+                                                         FALSE,
+                                                         G_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class,
+                                   PROP_SKIP_REMINDER,
+                                   g_param_spec_boolean ("skip-reminder",
+                                                         "Skip reminder",
+                                                         "Skip registration reminder dialog",
+                                                         FALSE,
+                                                         G_PARAM_READWRITE));
 }
 
 GtkWidget*

src/glade-window.c

@@ -70,6 +70,7 @@
 #define CONFIG_KEY_SHOW_TABS        "show-tabs"
 #define CONFIG_KEY_SHOW_STATUS      "show-statusbar"
 #define CONFIG_KEY_EDITOR_HEADER    "show-editor-header"
+#define CONFIG_KEY_PALETTE          "palette-appearance"
 
 #define CONFIG_GROUP_LOAD_SAVE      "Load and Save"
 #define CONFIG_KEY_BACKUP           "backup"
@@ -115,6 +116,7 @@ struct _GladeWindowPrivate
   GladeEditor  *editor;                 /* The editor */
 
   GtkWidget *statusbar;                 /* A pointer to the status bar. */
+  guint statusbar_context_id;           /* The context id of general messages */
   guint statusbar_menu_context_id;      /* The context id of the menu bar */
   guint statusbar_actions_context_id;   /* The context id of actions messages */
 
@@ -2545,12 +2547,7 @@ static void
 on_registration_action_activate (GtkAction   *action,
                                  GladeWindow *window)
 {
-  GladeWindowPrivate *priv = window->priv;
-
-  if (!priv->registration)
-    priv->registration = glade_registration_new ();
-
-  gtk_window_present (GTK_WINDOW (priv->registration));
+  gtk_window_present (GTK_WINDOW (window->priv->registration));
 }
 
 void
@@ -2850,6 +2847,9 @@ save_windows_config (GladeWindow *window, GKeyFile *config)
 
   g_key_file_set_boolean (config, CONFIG_GROUP_WINDOWS, CONFIG_KEY_EDITOR_HEADER,
                           gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (priv->editor_header_visible_action)));
+
+  g_key_file_set_integer (config, CONFIG_GROUP_WINDOWS, CONFIG_KEY_PALETTE,
+                          gtk_radio_action_get_current_value (GTK_RADIO_ACTION (priv->icons_and_labels_radioaction)));
 }
 
 static void
@@ -2999,6 +2999,7 @@ glade_window_config_load (GladeWindow *window)
 {
   GKeyFile *config = glade_app_get_config ();
   gboolean show_toolbar, show_tabs, show_status, show_header;
+  gint palette_appearance;
   GladeWindowPrivate *priv = window->priv;
   GError *error = NULL;
 
@@ -3042,6 +3043,15 @@ glade_window_config_load (GladeWindow *window)
       error = (g_error_free (error), NULL);
     }
 
+  if ((palette_appearance =
+       g_key_file_get_integer (config, CONFIG_GROUP_WINDOWS,
+                               CONFIG_KEY_PALETTE, &error)) == 0 &&
+      error != NULL)
+    {
+      palette_appearance = 1; /* Default to icons */
+      error = (g_error_free (error), NULL);
+    }
+
   if (show_toolbar)
     gtk_widget_show (priv->toolbar);
   else
@@ -3065,6 +3075,8 @@ glade_window_config_load (GladeWindow *window)
 
   gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (priv->editor_header_visible_action), show_header);
 
+  gtk_radio_action_set_current_value (GTK_RADIO_ACTION (priv->icons_and_labels_radioaction), palette_appearance);
+
   /* Paned positions */
   load_paned_position (config, window->priv->left_paned, "left_pane", 200);
   load_paned_position (config, window->priv->center_paned, "center_pane", 400);
@@ -3176,6 +3188,8 @@ glade_window_init (GladeWindow *window)
   glade_init ();
 
   gtk_widget_init_template (GTK_WIDGET (window));
+
+  priv->registration = glade_registration_new ();
 }
 
 static void
@@ -3220,6 +3234,7 @@ glade_window_constructed (GObject *object)
               _("Properties"), "properties", priv->right_paned, FALSE);
 
   /* status bar */
+  priv->statusbar_context_id = gtk_statusbar_get_context_id (GTK_STATUSBAR (priv->statusbar), "general");
   priv->statusbar_menu_context_id = gtk_statusbar_get_context_id (GTK_STATUSBAR (priv->statusbar), "menu");
   priv->statusbar_actions_context_id = gtk_statusbar_get_context_id (GTK_STATUSBAR (priv->statusbar), "actions");
 
@@ -3452,3 +3467,57 @@ glade_window_check_devhelp (GladeWindow *window)
   if (glade_util_have_devhelp ())
     g_signal_connect (glade_app_get (), "doc-search", G_CALLBACK (doc_search_cb), window);
 }
+
+void
+glade_window_registration_notify_user (GladeWindow *window)
+{
+  gboolean skip_reminder, completed;
+  GladeWindowPrivate *priv;
+
+  g_return_if_fail (GLADE_IS_WINDOW (window));
+  priv = window->priv;
+
+  g_object_get (priv->registration,
+                "completed", &completed,
+                "skip-reminder", &skip_reminder,
+                NULL);
+  
+  if (!completed && !skip_reminder)
+    {
+      GtkWidget *dialog, *check;
+
+      dialog = gtk_message_dialog_new (GTK_WINDOW (glade_app_get_window ()),
+                                       GTK_DIALOG_DESTROY_WITH_PARENT,
+                                       GTK_MESSAGE_QUESTION,
+                                       GTK_BUTTONS_YES_NO,
+                                       "%s",
+                                       /* translators: Primary message of a dialog used to notify the user about the survey */
+                                       _("We are conducting a user survey\n would you like to take it now?"));
+
+      gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s",
+                                                /* translators: Secondary text of a dialog used to notify the user about the survey */
+                                                _("If not, you can always find it in the Help menu."));
+
+      check = gtk_check_button_new_with_mnemonic (_("_Do not show this dialog again"));
+      gtk_box_pack_end (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+                        check, FALSE, FALSE, 0);
+      gtk_widget_set_halign (check, GTK_ALIGN_START);
+      gtk_widget_set_margin_start (check, 6);
+      gtk_widget_show (check);
+
+      if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_YES)
+          gtk_window_present (GTK_WINDOW (priv->registration));
+      
+      if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check)))
+        {
+          g_object_set (priv->registration, "skip-reminder", TRUE, NULL);
+          glade_app_config_save ();
+        }
+
+      gtk_widget_destroy (dialog);
+    }
+  else if (!completed)
+    glade_util_flash_message (priv->statusbar, priv->statusbar_context_id, "%s",
+                              /* translators: Text to show in the statusbar if the user did not completed the survey and choose not to show the notification dialog again */
+                              _("Go to Help -> Registration & User Survey and complete our survey!"));
+}

src/glade-window.h

@@ -59,6 +59,8 @@ gboolean    glade_window_open_project  (GladeWindow *window,
 
 void        glade_window_check_devhelp (GladeWindow *window);
 
+void        glade_window_registration_notify_user (GladeWindow *window);
+
 G_END_DECLS
 
 #endif /* __GLADE_WINDOW_H__ */

src/main.c

@@ -197,6 +197,8 @@ main (int argc, char *argv[])
   
   if (!opened_project)
     glade_window_new_project (window);
+
+  glade_window_registration_notify_user (window);
   
   gtk_main ();
 

tests/create-widgets.c

@@ -76,6 +76,13 @@ test_create_widget (gconstpointer data)
   g_assert (object_finalized);
 }
 
+static gint
+adaptor_cmp (gconstpointer a, gconstpointer b)
+{
+  return g_strcmp0 (glade_widget_adaptor_get_name ((gpointer)a),
+                    glade_widget_adaptor_get_name ((gpointer)b));
+}
+
 int
 main (int   argc,
       char *argv[])
@@ -87,8 +94,8 @@ main (int   argc,
   glade_init ();
   glade_app_get ();
 
-  adaptors = glade_widget_adaptor_list_adaptors ();
-
+  adaptors = g_list_sort (glade_widget_adaptor_list_adaptors (), adaptor_cmp);
+    
   for (l = adaptors; l; l = l->next)
     {
       GladeWidgetAdaptor *adaptor = l->data;
@@ -97,12 +104,8 @@ main (int   argc,
       adaptor_type = glade_widget_adaptor_get_object_type (adaptor);
 
       if (G_TYPE_IS_INSTANTIATABLE (adaptor_type) && !G_TYPE_IS_ABSTRACT (adaptor_type) &&
-	  /* FIXME: Status Icon crashes at dispose time unrealizing it's GtkTrayIcon without a window */
-	  adaptor_type != GTK_TYPE_STATUS_ICON &&
 	  /* FIXME: FileChooserButton leaks a GTask which will crash in the following test */
 	  adaptor_type != GTK_TYPE_FILE_CHOOSER_BUTTON &&
-	  /* FIXME: App choosers leak some async operations after finalization, causing subsequent tests to fail */
-	  !g_type_is_a (adaptor_type, GTK_TYPE_APP_CHOOSER) &&
           /* FIXME: GtkRecentChooser tries to remove an unknown source id */
 	  !g_type_is_a (adaptor_type, GTK_TYPE_RECENT_CHOOSER))
 	{