gimp r27005 - in trunk: . app/actions

[neo svn gnome org]

Author: neo
Date: Fri Sep 19 06:43:37 2008
New Revision: 27005
URL: http://svn.gnome.org/viewvc/gimp?rev=27005&view=rev

Log:
2008-09-19  Sven Neumann  <sven gimp org>

	* app/actions/plug-in-actions.c 
(plug_in_actions_history_changed):
	try to use the menu label with ellipsis instead of the result of
	gimp_plug_in_procedure_get_label() which has ellipsis and
	mnemonics stripped.



Modified:
   trunk/ChangeLog
   trunk/app/actions/plug-in-actions.c

Modified: trunk/app/actions/plug-in-actions.c
==============================================================================
--- trunk/app/actions/plug-in-actions.c	(original)
+++ trunk/app/actions/plug-in-actions.c	Fri Sep 19 06:43:37 2008
@@ -488,6 +488,8 @@
       gchar       *reshow;
       gboolean     sensitive = FALSE;
 
+      label = gimp_plug_in_procedure_get_label (proc);
+
       /*  copy the sensitivity of the plug-in procedure's actual action
        *  instead of calling plug_in_actions_update() because doing the
        *  latter would set the sensitivity of this image's action on
@@ -498,8 +500,6 @@
       if (actual_action)
         sensitive = gtk_action_get_sensitive (actual_action);
 
-      label = gimp_plug_in_procedure_get_label (proc);
-
       repeat = g_strdup_printf (_("Re_peat \"%s\""),  label);
       reshow = g_strdup_printf (_("R_e-Show \"%s\""), label);
 
@@ -527,16 +527,28 @@
 
   for (i = 0; i < gimp_plug_in_manager_history_length (manager); i++)
     {
-      GtkAction *action;
-      GtkAction *actual_action;
-      gchar     *name      = g_strdup_printf ("plug-in-recent-%02d", i + 1);
-      gboolean   sensitive = FALSE;
+      GtkAction   *action;
+      GtkAction   *actual_action;
+      const gchar *label;
+      gchar       *name;
+      gboolean     sensitive = FALSE;
 
+      name = g_strdup_printf ("plug-in-recent-%02d", i + 1);
       action = gtk_action_group_get_action (GTK_ACTION_GROUP (group), name);
       g_free (name);
 
       proc = gimp_plug_in_manager_history_nth (manager, i);
 
+      if (proc->menu_label)
+        {
+          label = dgettext (gimp_plug_in_procedure_get_locale_domain (proc),
+                            proc->menu_label);
+        }
+      else
+        {
+          label = gimp_plug_in_procedure_get_label (proc);
+        }
+
       /*  see comment above  */
       actual_action = gtk_action_group_get_action (GTK_ACTION_GROUP (group),
                                                    GIMP_OBJECT (proc)->name);
@@ -547,7 +559,7 @@
                     "visible",   TRUE,
                     "sensitive", sensitive,
                     "procedure", proc,
-                    "label",     gimp_plug_in_procedure_get_label (proc),
+                    "label",     label,
                     "stock-id",  gimp_plug_in_procedure_get_stock_id (proc),
                     "tooltip",   gimp_plug_in_procedure_get_blurb (proc),
                     NULL);