← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/xvidcap/jaunty-proposed

« back to all changes in this revision

Viewing changes to src/gnome_warning.c

  • Committer: Bazaar Package Importer
  • Author(s): Lionel Le Folgoc, Andrew Starr-Bochicchio, Lionel Le Folgoc
  • Date: 2008-12-26 00:10:06 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20081226001006-2040ls9680bd1blt
Tags: 1.1.7-0.2ubuntu1
https://launchpad.net/bugs/298547
https://launchpad.net/bugs/311412
[ Andrew Starr-Bochicchio ]
* Merge from debian-multimedia (LP: #298547), Ubuntu Changes:
 - For ffmpeg-related build-deps, fix versionized dependencies
   as the ubuntu versioning is different than debian-multimedia's.

[ Lionel Le Folgoc ]
* LP: #311412 is fixed since the 1.1.7~rc1-0.1 revision.
* debian/patches/03_ffmpeg.diff: updated to fix FTBFS due to libswscale API
  change (cherry-pick from Gentoo #234383).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gnome_warning.c
47
47
#include "control.h"
48
48
#include "gnome_options.h"
49
49
#include "gnome_ui.h"
50
 
#include "xv_error_item.h"
 
50
#include "xvc_error_item.h"
51
51
#include "app_data.h"
52
52
 
53
53
/*
213
213
                || (app->flags & FLG_RUN_VERBOSE)) {
214
214
                if (err->err->type == XVC_ERR_FATAL)
215
215
                    count_fatal_messages++;
216
 
                eitem = xv_error_item_new_with_error (err->err);
 
216
                eitem = xvc_error_item_new_with_error (err->err);
217
217
                gtk_box_pack_start (GTK_BOX (vbox), eitem, FALSE, FALSE, 0);
218
218
                gtk_widget_show (eitem);
219
219
            }