~wongchiachen/ubuntu/precise/totem/hey_about_dialog

« back to all changes in this revision

Viewing changes to src/totem-options.h

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2011-05-20 16:38:02 UTC
  • mfrom: (1.11.13 upstream) (2.1.17 experimental)
  • Revision ID: james.westby@ubuntu.com-20110520163802-p3lohdmfvws2jqeo
Tags: 3.0.1-0ubuntu1
* Resynchronize on Debian, remaining diffs:
* debian/control.in:
  - use suggests rather than recommends for universe gstreamer components
  - add totem-plugins-extra for the components which have depends in universe
  - add build-depends on gnome-common, dh-autoreconf, 
    liblaunchpad-intrgration-3.0-dev, hardening-wrapper
  - drop build-depends on libepc-ui-dev, python-feedparser, xulrunner-dev,
    libtracker-sparql-0.10-dev
  - add XB-Npp-Description and XB-Npp-Filename header to the 
    totem-mozilla package to improve ubufox/ubuntu plugin db integration 
  - change refences from Iceweasel to Firefox
  - recommends gnome-icon-theme-symbolic rather than depending on it
  - list firefox as a totem-mozilla recommends before epiphany-browser
  - libtotem replaces totem (<< 3.0.1-1) for ppa upgrades
* debian/totem-common.install:
  - Install apport hook
* debian/totem-plugins-extra.install:
  - Plugins split out ouf totem-plugins
* debian/totem-plugins.install:    
  - Move some plugins to totem-plugins-extra
* debian/totem.preinst:
  - No longer required as Lucid has been released
* debian/patches/01_fake_keypresses.patch:
  - dropped it's an old workaround and should not be required
* debian/patches/02_lpi.patch:
  - Launchpad integration
* debian/patches/03_default_options.patch: 
  - enable the youtube option by default
* debian/patches/70_bbc_plugin.patch:
  - bbc content viewer, needs to be fixed for the new version
* debian/source_totem.py:
  - ubuntu apport debugging
* debian/rules:
  - run autoreconf on build
* debian/watch:
  - Watch for unstable versions

Show diffs side-by-side

added added

removed removed

Lines of Context:
23
23
#ifndef TOTEM_OPTIONS_H
24
24
#define TOTEM_OPTIONS_H
25
25
 
26
 
#include <gconf/gconf-client.h>
27
 
#include <unique/uniqueapp.h>
 
26
#include <gtk/gtk.h>
28
27
 
29
28
#include "totem.h"
30
29
 
48
47
        gboolean quit;
49
48
        gboolean enqueue;
50
49
        gboolean replace;
51
 
        gboolean notconnectexistingsession;
52
50
        gdouble playlistidx;
53
51
        gint64 seek;
54
52
        gchar **filenames;
62
60
                                  const TotemCmdLineOptions* options);
63
61
void totem_options_process_late (Totem *totem, 
64
62
                                 const TotemCmdLineOptions* options);
65
 
void totem_options_process_for_server (UniqueApp *app,
 
63
void totem_options_process_for_server (Totem *totem,
66
64
                                       const TotemCmdLineOptions* options);
67
65
 
68
66
G_END_DECLS