← Back to branch summary

~ubuntu-branches/ubuntu/trusty/gimp/trusty

« back to all changes in this revision

Viewing changes to app/config/gimprc-unknown.c

  • Committer: Package Import Robot
  • Author(s): Robert Ancell
  • Date: 2012-09-19 17:16:47 UTC
  • mfrom: (1.1.27) (0.4.17 sid)
  • Revision ID: package-import@ubuntu.com-20120919171647-5dytjrc7bgb935we
Tags: 2.8.2-1ubuntu1
https://launchpad.net/bugs/1050831
* Merge from Debian unstable (LP: #1050831). Remaining Ubuntu changes:
* debian/control:
  - Update description
  - Build-depend on libtiff-dev instead of libtiff4-dev.
* debian/rules:
  - Set gettext domain and update translation templates
* debian/patches/02_help-message.patch:
* debian/patches/03_gimp.desktop.in.in.patch:
  - Update some strings for Ubuntu

Show diffs side-by-side

added added

removed removed

Lines of Context:
app/config/gimprc-unknown.c
115
115
  token->key   = g_strdup (key);
116
116
  token->value = g_strdup (value);
117
117
 
118
 
  if (!last)
 
118
  if (last)
 
119
    {
 
120
      last = g_slist_last (g_slist_append (last, token));
 
121
    }
 
122
  else
119
123
    {
120
124
      unknown_tokens = g_slist_append (NULL, token);
121
125