GNOME.org
 

[glade3] * gladeui/glade-command.[ch], gladeui/glade-project.c, src/glade-window.c: Privatized GladeCommand

commit 97975f7e3a13245a773a0157642081a338ca45c4
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date:   Wed Jan 5 17:24:33 2011 +0900

    	* gladeui/glade-command.[ch], gladeui/glade-project.c, src/glade-window.c:
    	Privatized GladeCommand members.

 ChangeLog               |    3 +
 gladeui/glade-command.c |  203 ++++++++++++++++++++++++++++-------------------
 gladeui/glade-command.h |   53 ++++++-------
 gladeui/glade-project.c |   14 ++-
 src/glade-window.c      |    8 +-
 5 files changed, 161 insertions(+), 120 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 704e80d..1d8a09b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,9 @@
 	* gladeui/glade-clipboard.[ch], gladeui/glade-project.c:
 	Privatized GladeClipboard members.
 
+	* gladeui/glade-command.[ch], gladeui/glade-project.c, src/glade-window.c:
+	Privatized GladeCommand members.
+
 2011-01-04  Johannes Schmid <jhs gnome org>
 
 	* data/gladeui-2.0.pc.in: Fix include paths and library name
diff --git a/gladeui/glade-command.c b/gladeui/glade-command.c
index 1269fb6..0e3566a 100644
--- a/gladeui/glade-command.c
+++ b/gladeui/glade-command.c
@@ -49,6 +49,20 @@
 #include "glade-app.h"
 #include "glade-name-context.h"
 
+struct _GladeCommandPrivate
+{
+  GladeProject *project; /* The project this command is created for */
+
+  gchar *description; /* a string describing the command.
+		       * It's used in the undo/redo menu entry.
+		       */
+
+  gint   group_id;    /* If this is part of a command group, this is
+		       * the group id (id is needed only to ensure that
+		       * consecutive groups dont get merged).
+		       */
+};
+
 /* Concerning placeholders: we do not hold any reference to placeholders,
  * placeholders that are supplied by the backend are not reffed, placeholders
  * that are created by glade-command are temporarily owned by glade-command
@@ -67,8 +81,6 @@ typedef struct
   gulong handler_id;
 } CommandData;
 
-static GObjectClass *parent_class = NULL;
-
 /* Group description used for the current group
  */
 static gchar *gc_group_description = NULL;
@@ -82,32 +94,7 @@ static gint gc_group_id = 1;
 static gint gc_group_depth = 0;
 
 
-#define MAKE_TYPE(func, type, parent)			\
-GType							\
-func ## _get_type (void)				\
-{							\
-	static GType cmd_type = 0;			\
-							\
-	if (!cmd_type)					\
-	{						\
-		static const GTypeInfo info =		\
-		{					\
-			sizeof (type ## Class),		\
-			(GBaseInitFunc) NULL,		\
-			(GBaseFinalizeFunc) NULL,	\
-			(GClassInitFunc) func ## _class_init,	\
-			(GClassFinalizeFunc) NULL,	\
-			NULL,				\
-			sizeof (type),			\
-			0,				\
-			(GInstanceInitFunc) NULL	\
-		};					\
-							\
-		cmd_type = g_type_register_static (parent, #type, &info, 0);	\
-	}						\
-							\
-	return cmd_type;				\
-}							\
+G_DEFINE_TYPE (GladeCommand, glade_command, G_TYPE_OBJECT)
 
 static void
 glade_command_finalize (GObject * obj)
@@ -115,11 +102,11 @@ glade_command_finalize (GObject * obj)
   GladeCommand *cmd = (GladeCommand *) obj;
   g_return_if_fail (cmd != NULL);
 
-  if (cmd->description)
-    g_free (cmd->description);
+  if (cmd->priv->description)
+    g_free (cmd->priv->description);
 
   /* Call the base class dtor */
-  (*G_OBJECT_CLASS (parent_class)->finalize) (obj);
+  (*G_OBJECT_CLASS (glade_command_parent_class)->finalize) (obj);
 }
 
 static gboolean
@@ -135,12 +122,19 @@ 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);
+}
+
+static void
 glade_command_class_init (GladeCommandClass * klass)
 {
   GObjectClass *object_class;
 
   object_class = G_OBJECT_CLASS (klass);
-  parent_class = g_type_class_peek_parent (klass);
 
   object_class->finalize = glade_command_finalize;
 
@@ -148,10 +142,38 @@ 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));
 }
 
-/* compose the _get_type function for GladeCommand */
-MAKE_TYPE (glade_command, GladeCommand, G_TYPE_OBJECT)
+/* Macros for defining the derived command types */
+#define MAKE_TYPE(func, type, parent)			\
+GType							\
+func ## _get_type (void)				\
+{							\
+	static GType cmd_type = 0;			\
+							\
+	if (!cmd_type)					\
+	{						\
+		static const GTypeInfo info =		\
+		{					\
+			sizeof (type ## Class),		\
+			(GBaseInitFunc) NULL,		\
+			(GBaseFinalizeFunc) NULL,	\
+			(GClassInitFunc) func ## _class_init,	\
+			(GClassFinalizeFunc) NULL,	\
+			NULL,				\
+			sizeof (type),			\
+			0,				\
+			(GInstanceInitFunc) NULL	\
+		};					\
+							\
+		cmd_type = g_type_register_static (parent, #type, &info, 0);	\
+	}						\
+							\
+	return cmd_type;				\
+}							\
+
 #define GLADE_MAKE_COMMAND(type, func)					\
 static gboolean								\
 func ## _undo (GladeCommand *me);					\
@@ -179,6 +201,25 @@ typedef struct {							\
 	GladeCommandClass cmd;						\
 } type ## Class;							\
 static MAKE_TYPE(func, type, GLADE_TYPE_COMMAND)
+
+
+G_CONST_RETURN gchar *
+glade_command_description (GladeCommand *command)
+{
+  g_return_val_if_fail (GLADE_IS_COMMAND (command), NULL);
+
+  return command->priv->description;
+}
+
+gint
+glade_command_group_id (GladeCommand *command)
+{
+  g_return_val_if_fail (GLADE_IS_COMMAND (command), -1);
+
+  return command->priv->group_id;
+}
+
+
 /**
  * glade_command_execute:
  * @command: A #GladeCommand
@@ -187,7 +228,7 @@ static MAKE_TYPE(func, type, GLADE_TYPE_COMMAND)
  *
  * Returns: whether the command was successfully executed
  */
-    gboolean
+gboolean
 glade_command_execute (GladeCommand * command)
 {
   g_return_val_if_fail (GLADE_IS_COMMAND (command), FALSE);
@@ -228,7 +269,7 @@ glade_command_unifies (GladeCommand * command, GladeCommand * other)
   /* Cannot unify with a part of a command group.
    * Unify atomic commands only
    */
-  if (command->group_id != 0 || (other && other->group_id != 0))
+  if (command->priv->group_id != 0 || (other && other->priv->group_id != 0))
     return FALSE;
 
   return GLADE_COMMAND_GET_CLASS (command)->unifies (command, other);
@@ -305,9 +346,9 @@ glade_command_check_group (GladeCommand * cmd)
   g_return_if_fail (GLADE_IS_COMMAND (cmd));
   if (gc_group_description)
     {
-      cmd->description =
-          (g_free (cmd->description), g_strdup (gc_group_description));
-      cmd->group_id = gc_group_id;
+      cmd->priv->description =
+          (g_free (cmd->priv->description), g_strdup (gc_group_description));
+      cmd->priv->group_id = gc_group_id;
     }
 }
 
@@ -564,9 +605,9 @@ glade_command_set_property_collapse (GladeCommand * this_cmd,
 
   /* Set the description
    */
-  g_free (this_cmd->description);
-  this_cmd->description = other_cmd->description;
-  other_cmd->description = NULL;
+  g_free (this_cmd->priv->description);
+  this_cmd->priv->description = other_cmd->priv->description;
+  other_cmd->priv->description = NULL;
 }
 
 
@@ -629,7 +670,7 @@ glade_command_set_properties_list (GladeProject * project, GList * props)
   me = (GladeCommandSetProperty *)
       g_object_new (GLADE_COMMAND_SET_PROPERTY_TYPE, NULL);
   cmd = GLADE_COMMAND (me);
-  cmd->project = project;
+  cmd->priv->project = project;
 
   /* Ref all props */
   for (list = props; list; list = list->next)
@@ -639,11 +680,11 @@ glade_command_set_properties_list (GladeProject * project, GList * props)
     }
 
   me->sdata = props;
-  cmd->description = glade_command_set_property_description (me);
+  cmd->priv->description = glade_command_set_property_description (me);
 
   multiple = g_list_length (me->sdata) > 1;
   if (multiple)
-    glade_command_push_group (cmd->description);
+    glade_command_push_group (cmd->priv->description);
 
   glade_command_check_group (GLADE_COMMAND (me));
 
@@ -651,7 +692,7 @@ glade_command_set_properties_list (GladeProject * project, GList * props)
   success = glade_command_set_property_execute (cmd);
 
   if (success)
-    glade_project_push_undo (cmd->project, cmd);
+    glade_project_push_undo (cmd->priv->project, cmd);
   else
     g_object_unref (G_OBJECT (me));
 
@@ -785,7 +826,7 @@ glade_command_set_name_execute (GladeCommand * cmd)
   g_return_val_if_fail (me->widget != NULL, TRUE);
   g_return_val_if_fail (me->name != NULL, TRUE);
 
-  glade_project_set_widget_name (cmd->project, me->widget, me->name);
+  glade_project_set_widget_name (cmd->priv->project, me->widget, me->name);
 
   tmp = me->old_name;
   me->old_name = me->name;
@@ -842,8 +883,8 @@ glade_command_set_name_collapse (GladeCommand * this_cmd,
   nthis->old_name = nother->old_name;
   nother->old_name = NULL;
 
-  g_free (this_cmd->description);
-  this_cmd->description =
+  g_free (this_cmd->priv->description);
+  this_cmd->priv->description =
       g_strdup_printf (_("Renaming %s to %s"), nthis->name, nthis->old_name);
 }
 
@@ -864,19 +905,19 @@ glade_command_set_name (GladeWidget * widget, const gchar * name)
 
   me = g_object_new (GLADE_COMMAND_SET_NAME_TYPE, NULL);
   cmd = GLADE_COMMAND (me);
-  cmd->project = glade_widget_get_project (widget);
+  cmd->priv->project = glade_widget_get_project (widget);
 
   me->widget = widget;
   me->name = g_strdup (name);
   me->old_name = g_strdup (glade_widget_get_name (widget));
 
-  cmd->description =
+  cmd->priv->description =
       g_strdup_printf (_("Renaming %s to %s"), me->old_name, me->name);
 
   glade_command_check_group (GLADE_COMMAND (me));
 
   if (glade_command_set_name_execute (GLADE_COMMAND (me)))
-    glade_project_push_undo (cmd->project, cmd);
+    glade_project_push_undo (cmd->priv->project, cmd);
   else
     g_object_unref (G_OBJECT (me));
 }
@@ -998,11 +1039,11 @@ glade_command_add (GList            *widgets,
   adaptor = glade_widget_get_adaptor (widget);
 
   if (placeholder && GWA_IS_TOPLEVEL (adaptor) == FALSE)
-    cmd->project = glade_placeholder_get_project (placeholder);
+    cmd->priv->project = glade_placeholder_get_project (placeholder);
   else
-    cmd->project = project;
+    cmd->priv->project = project;
 
-  GLADE_COMMAND (me)->description =
+  GLADE_COMMAND (me)->priv->description =
       g_strdup_printf (_("Add %s"), g_list_length (widgets) == 1 ?
                        glade_widget_get_name (widget) : _("multiple"));
 
@@ -1079,7 +1120,7 @@ glade_command_add (GList            *widgets,
    * Push it onto the undo stack only on success
    */
   if (glade_command_add_remove_execute (cmd))
-    glade_project_push_undo (cmd->project, cmd);
+    glade_project_push_undo (cmd->priv->project, cmd);
   else
     g_object_unref (G_OBJECT (me));
 
@@ -1177,8 +1218,8 @@ glade_command_remove (GList * widgets)
         }
     }
 
-  GLADE_COMMAND (me)->project = glade_widget_get_project (widget);
-  GLADE_COMMAND (me)->description = g_strdup ("dummy");
+  GLADE_COMMAND (me)->priv->project = glade_widget_get_project (widget);
+  GLADE_COMMAND (me)->priv->description = g_strdup ("dummy");
 
   if (g_list_length (widgets) == 1)
     glade_command_push_group (_("Remove %s"),
@@ -1234,7 +1275,7 @@ glade_command_remove (GList * widgets)
   glade_command_check_group (GLADE_COMMAND (me));
 
   if (glade_command_add_remove_execute (GLADE_COMMAND (me)))
-    glade_project_push_undo (GLADE_COMMAND (me)->project,
+    glade_project_push_undo (GLADE_COMMAND (me)->priv->project,
                              GLADE_COMMAND (me));
   else
     g_object_unref (G_OBJECT (me));
@@ -1269,7 +1310,7 @@ glade_command_add_execute (GladeCommandAddRemove * me)
 
   if (me->widgets)
     {
-      glade_project_selection_clear (GLADE_COMMAND (me)->project, FALSE);
+      glade_project_selection_clear (GLADE_COMMAND (me)->priv->project, FALSE);
 
       for (list = me->widgets; list && list->data; list = list->next)
         {
@@ -1375,23 +1416,23 @@ glade_command_add_execute (GladeCommandAddRemove * me)
                 }
             }
 
-          glade_project_add_object (GLADE_COMMAND (me)->project,
+          glade_project_add_object (GLADE_COMMAND (me)->priv->project,
 				    glade_widget_get_object (cdata->widget));
 
           for (l = cdata->reffed; l; l = l->next)
             {
               GladeWidget *reffed = l->data;
-              glade_project_add_object (GLADE_COMMAND (me)->project,
+              glade_project_add_object (GLADE_COMMAND (me)->priv->project,
                                         glade_widget_get_object (reffed));
             }
 
-	  glade_project_selection_add (GLADE_COMMAND (me)->project, 
+	  glade_project_selection_add (GLADE_COMMAND (me)->priv->project, 
 				       glade_widget_get_object (cdata->widget), FALSE);
 
           glade_widget_show (cdata->widget);
         }
 
-      glade_project_queue_selection_changed (GLADE_COMMAND (me)->project);
+      glade_project_queue_selection_changed (GLADE_COMMAND (me)->priv->project);
     }
   return TRUE;
 }                               /* end of glade_command_add_execute() */
@@ -1409,13 +1450,13 @@ glade_command_remove_execute (GladeCommandAddRemove * me)
 
       glade_widget_hide (cdata->widget);
 
-      glade_project_remove_object (GLADE_COMMAND (me)->project,
+      glade_project_remove_object (GLADE_COMMAND (me)->priv->project,
                                    glade_widget_get_object (cdata->widget));
 
       for (l = cdata->reffed; l; l = l->next)
         {
           reffed = l->data;
-          glade_project_remove_object (GLADE_COMMAND (me)->project,
+          glade_project_remove_object (GLADE_COMMAND (me)->priv->project,
                                        glade_widget_get_object (reffed));
         }
 
@@ -1857,8 +1898,8 @@ glade_command_add_remove_change_signal (GladeWidget * glade_widget,
   me->signal = glade_signal_clone (signal);
   me->new_signal = new_signal ? glade_signal_clone (new_signal) : NULL;
 
-  cmd->project = glade_widget_get_project (glade_widget);
-  cmd->description =
+  cmd->priv->project = glade_widget_get_project (glade_widget);
+  cmd->priv->description =
       g_strdup_printf (type == GLADE_ADD ? _("Add signal handler %s") :
                        type == GLADE_REMOVE ? _("Remove signal handler %s") :
                        _("Change signal handler %s"), 
@@ -1867,7 +1908,7 @@ glade_command_add_remove_change_signal (GladeWidget * glade_widget,
   glade_command_check_group (GLADE_COMMAND (me));
 
   if (glade_command_add_signal_execute (cmd))
-    glade_project_push_undo (cmd->project, cmd);
+    glade_project_push_undo (cmd->priv->project, cmd);
   else
     g_object_unref (G_OBJECT (me));
 }
@@ -2076,16 +2117,16 @@ glade_command_set_i18n (GladeProperty * property,
   me->old_context = g_strdup (glade_property_i18n_get_context (property));
   me->old_comment = g_strdup (glade_property_i18n_get_comment (property));
 
-  GLADE_COMMAND (me)->project = 
+  GLADE_COMMAND (me)->priv->project = 
     glade_widget_get_project (glade_property_get_widget (property));
-  GLADE_COMMAND (me)->description =
+  GLADE_COMMAND (me)->priv->description =
       g_strdup_printf (_("Setting i18n metadata"));;
 
   glade_command_check_group (GLADE_COMMAND (me));
 
   /* execute the command and push it on the stack if successful */
   if (glade_command_set_i18n_execute (GLADE_COMMAND (me)))
-    glade_project_push_undo (GLADE_COMMAND (me)->project, GLADE_COMMAND (me));
+    glade_project_push_undo (GLADE_COMMAND (me)->priv->project, GLADE_COMMAND (me));
   else
     g_object_unref (G_OBJECT (me));
 }
@@ -2121,7 +2162,7 @@ glade_command_set_policy_execute (GladeCommand * cmd)
   GladeNamingPolicy policy;
 
   /* set the new policy */
-  glade_project_set_naming_policy (cmd->project, me->policy);
+  glade_project_set_naming_policy (cmd->priv->project, me->policy);
 
   /* swap the current values with the old values to prepare for undo */
   policy = me->policy;
@@ -2202,8 +2243,8 @@ glade_command_set_project_naming_policy (GladeProject * project,
       me->policy = policy;
       me->old_policy = glade_project_get_naming_policy (project);
 
-      GLADE_COMMAND (me)->project = project;
-      GLADE_COMMAND (me)->description = g_strdup_printf ("dummy string");
+      GLADE_COMMAND (me)->priv->project = project;
+      GLADE_COMMAND (me)->priv->description = g_strdup_printf ("dummy string");
 
       glade_command_check_group (GLADE_COMMAND (me));
 
@@ -2328,8 +2369,8 @@ glade_command_lock_widget (GladeWidget * widget, GladeWidget * locked)
   me->locked = g_object_ref (locked);
   me->locking = TRUE;
 
-  GLADE_COMMAND (me)->project = glade_widget_get_project (widget);
-  GLADE_COMMAND (me)->description =
+  GLADE_COMMAND (me)->priv->project = glade_widget_get_project (widget);
+  GLADE_COMMAND (me)->priv->description =
     g_strdup_printf (_("Locking %s by widget %s"), 
 		     glade_widget_get_name (locked),
 		     glade_widget_get_name (widget));
@@ -2340,7 +2381,7 @@ glade_command_lock_widget (GladeWidget * widget, GladeWidget * locked)
    * this sets the actual policy
    */
   if (glade_command_lock_execute (GLADE_COMMAND (me)))
-    glade_project_push_undo (GLADE_COMMAND (me)->project, GLADE_COMMAND (me));
+    glade_project_push_undo (GLADE_COMMAND (me)->priv->project, GLADE_COMMAND (me));
   else
     g_object_unref (G_OBJECT (me));
 
@@ -2369,8 +2410,8 @@ glade_command_unlock_widget (GladeWidget * widget)
   me->locked = g_object_ref (widget);
   me->locking = FALSE;
 
-  GLADE_COMMAND (me)->project = glade_widget_get_project (widget);
-  GLADE_COMMAND (me)->description =
+  GLADE_COMMAND (me)->priv->project = glade_widget_get_project (widget);
+  GLADE_COMMAND (me)->priv->description =
     g_strdup_printf (_("Unlocking %s"), glade_widget_get_name (widget));
 
   glade_command_check_group (GLADE_COMMAND (me));
@@ -2379,7 +2420,7 @@ glade_command_unlock_widget (GladeWidget * widget)
    * this sets the actual policy
    */
   if (glade_command_lock_execute (GLADE_COMMAND (me)))
-    glade_project_push_undo (GLADE_COMMAND (me)->project, GLADE_COMMAND (me));
+    glade_project_push_undo (GLADE_COMMAND (me)->priv->project, GLADE_COMMAND (me));
   else
     g_object_unref (G_OBJECT (me));
 
diff --git a/gladeui/glade-command.h b/gladeui/glade-command.h
index bde55cd..3a0277d 100644
--- a/gladeui/glade-command.h
+++ b/gladeui/glade-command.h
@@ -18,9 +18,10 @@ G_BEGIN_DECLS
 #define GLADE_IS_COMMAND_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_COMMAND))
 #define GLADE_COMMAND_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_COMMAND, GladeCommandClass))
 
-typedef struct _GladeCommand      GladeCommand;
-typedef struct _GladeCommandClass GladeCommandClass;
-typedef struct _GCSetPropData     GCSetPropData;
+typedef struct _GladeCommand        GladeCommand;
+typedef struct _GladeCommandClass   GladeCommandClass;
+typedef struct _GladeCommandPrivate GladeCommandPrivate;
+typedef struct _GCSetPropData       GCSetPropData;
 
 /**
  * GCSetPropData
@@ -42,16 +43,7 @@ struct _GladeCommand
 {
   GObject parent;
 
-  GladeProject *project; /* The project this command is created for */
-
-  gchar *description; /* a string describing the command.
-		       * It's used in the undo/redo menu entry.
-		       */
-
-  gint   group_id;    /* If this is part of a command group, this is
-		       * the group id (id is needed only to ensure that
-		       * consecutive groups dont get merged).
-		       */
+  GladeCommandPrivate *priv;
 };
 
 struct _GladeCommandClass
@@ -62,29 +54,30 @@ struct _GladeCommandClass
   gboolean (* undo)        (GladeCommand *this_cmd);
   gboolean (* unifies)     (GladeCommand *this_cmd, GladeCommand *other_cmd);
   void     (* collapse)    (GladeCommand *this_cmd, GladeCommand *other_cmd);
-};
-
-
 
-GType          glade_command_get_type      (void);
-
-void           glade_command_push_group    (const gchar       *fmt,
-					    ...);
-
-void           glade_command_pop_group     (void);
-
-gint           glade_command_get_group_depth (void);
+  void   (* glade_reserved1)   (void);
+  void   (* glade_reserved2)   (void);
+  void   (* glade_reserved3)   (void);
+  void   (* glade_reserved4)   (void);
+};
 
 
-gboolean       glade_command_execute       (GladeCommand      *command);
 
-gboolean       glade_command_undo          (GladeCommand      *command);
+GType                 glade_command_get_type             (void);
 
-gboolean       glade_command_unifies       (GladeCommand      *command,
-					    GladeCommand      *other);
+void                  glade_command_push_group           (const gchar       *fmt,
+							  ...);
+void                  glade_command_pop_group            (void);
+gint                  glade_command_get_group_depth      (void);
 
-void           glade_command_collapse      (GladeCommand      *command,
-					    GladeCommand      *other);
+G_CONST_RETURN gchar *glade_command_description          (GladeCommand      *command);
+gint                  glade_command_group_id             (GladeCommand      *command);
+gboolean              glade_command_execute              (GladeCommand      *command);
+gboolean              glade_command_undo                 (GladeCommand      *command);
+gboolean              glade_command_unifies              (GladeCommand      *command,
+							  GladeCommand      *other);
+void                  glade_command_collapse             (GladeCommand      *command,
+							  GladeCommand      *other);
 
 /************************** project *********************************/
 
diff --git a/gladeui/glade-project.c b/gladeui/glade-project.c
index c2a6e49..36f0d6f 100644
--- a/gladeui/glade-project.c
+++ b/gladeui/glade-project.c
@@ -545,7 +545,8 @@ glade_project_undo_impl (GladeProject * project)
                      glade_project_signals[CHANGED], 0, cmd, FALSE);
 
       if ((next_cmd = glade_project_next_undo_item (project)) != NULL &&
-          (next_cmd->group_id == 0 || next_cmd->group_id != cmd->group_id))
+          (glade_command_group_id (next_cmd) == 0 || 
+	   glade_command_group_id (next_cmd) != glade_command_group_id (cmd)))
         break;
     }
 }
@@ -565,7 +566,8 @@ glade_project_redo_impl (GladeProject * project)
                      glade_project_signals[CHANGED], 0, cmd, TRUE);
 
       if ((next_cmd = glade_project_next_redo_item (project)) != NULL &&
-          (next_cmd->group_id == 0 || next_cmd->group_id != cmd->group_id))
+          (glade_command_group_id (next_cmd) == 0 || 
+	   glade_command_group_id (next_cmd) != glade_command_group_id (cmd)))
         break;
     }
 }
@@ -3617,7 +3619,9 @@ walk_command (GList * list, gboolean forward)
 
   next_cmd = list ? list->data : NULL;
 
-  while (list && next_cmd->group_id != 0 && next_cmd->group_id == cmd->group_id)
+  while (list && 
+	 glade_command_group_id (next_cmd) != 0 && 
+	 glade_command_group_id (next_cmd) == glade_command_group_id (cmd))
     {
       if (forward)
         list = list->next;
@@ -3699,7 +3703,7 @@ glade_project_undo_items (GladeProject * project)
       if (!menu)
         menu = gtk_menu_new ();
 
-      item = gtk_menu_item_new_with_label (cmd->description);
+      item = gtk_menu_item_new_with_label (glade_command_description (cmd));
       gtk_widget_show (item);
       gtk_menu_shell_append (GTK_MENU_SHELL (menu), GTK_WIDGET (item));
       g_object_set_data (G_OBJECT (item), "command-data", cmd);
@@ -3739,7 +3743,7 @@ glade_project_redo_items (GladeProject * project)
       if (!menu)
         menu = gtk_menu_new ();
 
-      item = gtk_menu_item_new_with_label (cmd->description);
+      item = gtk_menu_item_new_with_label (glade_command_description (cmd));
       gtk_widget_show (item);
       gtk_menu_shell_append (GTK_MENU_SHELL (menu), GTK_WIDGET (item));
       g_object_set_data (G_OBJECT (item), "command-data", cmd);
diff --git a/src/glade-window.c b/src/glade-window.c
index 8c8e065..65e6eee 100644
--- a/src/glade-window.c
+++ b/src/glade-window.c
@@ -2868,11 +2868,11 @@ refresh_undo_redo (GladeWindow *window, GladeProject *project)
 
   change_menu_label
       (window, "/MenuBar/EditMenu/Undo", _("_Undo"),
-       undo ? undo->description : NULL);
+       undo ? glade_command_description (undo) : NULL);
 
   tooltip =
       g_strdup_printf (_("Undo: %s"),
-                       undo ? undo->description : _("the last action"));
+                       undo ? glade_command_description (undo) : _("the last action"));
   g_object_set (action, "tooltip", tooltip, NULL);
   g_free (tooltip);
 
@@ -2882,11 +2882,11 @@ refresh_undo_redo (GladeWindow *window, GladeProject *project)
 
   change_menu_label
       (window, "/MenuBar/EditMenu/Redo", _("_Redo"),
-       redo ? redo->description : NULL);
+       redo ? glade_command_description (redo) : NULL);
 
   tooltip =
       g_strdup_printf (_("Redo: %s"),
-                       redo ? redo->description : _("the last action"));
+                       redo ? glade_command_description (redo) : _("the last action"));
   g_object_set (action, "tooltip", tooltip, NULL);
   g_free (tooltip);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]