← Back to branch summary

~ubuntu-branches/ubuntu/karmic/gimp/karmic

« back to all changes in this revision

Viewing changes to app/actions/file-commands.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/actions/file-commands.c
165
165
      GError            *error = NULL;
166
166
      return_if_no_display (display, data);
167
167
 
 
168
      g_object_ref (display);
 
169
      g_object_ref (imagefile);
 
170
 
168
171
      progress = display->image ? NULL : GIMP_PROGRESS (display);
169
172
 
170
173
      image = file_open_with_display (gimp, action_data_get_context (data),
184
187
 
185
188
          g_free (filename);
186
189
        }
 
190
 
 
191
      g_object_unref (imagefile);
 
192
      g_object_unref (display);
187
193
    }
188
194
}
189
195