← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/gimp/oneiric-security

« back to all changes in this revision

Viewing changes to app/display/gimpdisplayshell-title.c

  • Committer: Bazaar Package Importer
  • Author(s): Pedro Fragoso
  • Date: 2008-11-24 14:16:39 UTC
  • mfrom: (1.1.17 upstream)
  • Revision ID: james.westby@ubuntu.com-20081124141639-12b1g29vvadd5pzp
Tags: 2.6.3-1ubuntu1
https://launchpad.net/bugs/301724
* Sync with Debian experimental (LP: #301724)
* debian/patches/02_help-message.patch,
  debian/patches/03_gimp.desktop.in.in.patch:
  - updated some strings for ubuntu
* debian/rules:
  - updated translation templates
* debian/control:
  - Drop webkit build dependency. gimp is the only thing pulling
    in webkit for the desktop CDs, and makes them explode
    Without the webkit help browser
    plugin, help will just be displayed in the default browser.

Show diffs side-by-side

added added

removed removed

Lines of Context:
app/display/gimpdisplayshell-title.c
331
331
                GimpDrawable *drawable = gimp_image_get_active_drawable (image);
332
332
 
333
333
                if (drawable)
334
 
                  i += print (title, title_len, i, "%s",
335
 
                              gimp_object_get_name (GIMP_OBJECT (drawable)));
 
334
                  {
 
335
                    gchar *desc;
 
336
 
 
337
                    desc = gimp_viewable_get_description (GIMP_VIEWABLE (drawable),
 
338
                                                          NULL);
 
339
 
 
340
                    i += print (title, title_len, i, "%s", desc);
 
341
 
 
342
                    g_free (desc);
 
343
                  }
336
344
                else
337
 
                  i += print (title, title_len, i, "%s", _("(none)"));
 
345
                  {
 
346
                    i += print (title, title_len, i, "%s", _("(none)"));
 
347
                  }
338
348
              }
339
349
              break;
340
350