← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/avidemux/jaunty

« back to all changes in this revision

Viewing changes to avidemux/ADM_userInterfaces/ADM_GTK/ADM_dialog/DIA_encoding.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Alessio Treglia
  • Date: 2009-02-17 23:41:46 UTC
  • mfrom: (1.1.12 upstream)
  • Revision ID: james.westby@ubuntu.com-20090217234146-eakx254awuch4wgw
Tags: 1:2.4.4-0.0ubuntu1
* Merge from debian multimedia, Ubuntu remaining changes:
  - debian/control:
    + Build-Depends on newer libx264-dev.
    + Don't Build-Depends on ccache and libamrnb-dev.
    + Build-Depends on libpulse-dev.
    + Fixed small typo in avidemux description.
  - Don't use ccache.
  - Drop patch to fix build with newer x264, it has been merged by upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
avidemux/ADM_userInterfaces/ADM_GTK/ADM_dialog/DIA_encoding.cpp
28
28
#include "ADM_toolkit_gtk/toolkit_gtk_include.h"
29
29
#include "ADM_libraries/ADM_utilities/avidemutils.h"
30
30
#include "ADM_userInterfaces/ADM_commonUI/DIA_working.h"
 
31
#include "ADM_toolkit_gtk/ADM_tray_gtk.h"
31
32
 
32
33
#include "ADM_assert.h" 
33
34
 
111
112
                {
112
113
                        gtk_window_iconify(GTK_WINDOW(dialog));
113
114
                        UI_iconify();
114
 
                        tray = new ADM_tray(dialog);
 
115
                        tray = new ADM_gtktray(dialog);
115
116
                }
116
117
                else
117
118
                        tray = NULL;