gimp r27406 - in branches/gimp-2-6: . app/display

[mitch svn gnome org]

Author: mitch
Date: Sat Oct 25 15:30:28 2008
New Revision: 27406
URL: http://svn.gnome.org/viewvc/gimp?rev=27406&view=rev

Log:
2008-10-25  Michael Natterer  <mitch gimp org>

	Merged from trunk:

	Bug 557870 â "Qmask" message popping up here and there

	* app/display/gimpdisplayshell-title.c
	(gimp_display_shell_format_title): use
	gimp_viewable_get_description() instead of gimp_object_get_name()
	for displaying the active drawable's name so the quick mask and
	the floating selection have the same names as in the
	layers/channels dialogs.



Modified:
   branches/gimp-2-6/ChangeLog
   branches/gimp-2-6/app/display/gimpdisplayshell-title.c

Modified: branches/gimp-2-6/app/display/gimpdisplayshell-title.c
==============================================================================
--- branches/gimp-2-6/app/display/gimpdisplayshell-title.c	(original)
+++ branches/gimp-2-6/app/display/gimpdisplayshell-title.c	Sat Oct 25 15:30:28 2008
@@ -331,10 +331,20 @@
                 GimpDrawable *drawable = gimp_image_get_active_drawable (image);
 
                 if (drawable)
-                  i += print (title, title_len, i, "%s",
-                              gimp_object_get_name (GIMP_OBJECT (drawable)));
+                  {
+                    gchar *desc;
+
+                    desc = gimp_viewable_get_description (GIMP_VIEWABLE (drawable),
+                                                          NULL);
+
+                    i += print (title, title_len, i, "%s", desc);
+
+                    g_free (desc);
+                  }
                 else
-                  i += print (title, title_len, i, "%s", _("(none)"));
+                  {
+                    i += print (title, title_len, i, "%s", _("(none)"));
+                  }
               }
               break;