~walkerlee/totem/pre-interview

« back to all changes in this revision

Viewing changes to src/totem-private.h

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-05-26 00:07:51 UTC
  • mfrom: (1.6.1) (24.1.4 experimental)
  • Revision ID: package-import@ubuntu.com-20130526000751-kv8ap3x1di4qq8j2
Tags: 3.8.2-0ubuntu1
* Sync with Debian. Remaining changes: 
* debian/control.in:
  - Drop build-depends on libepc-ui-dev and libgrilo-0.2-dev (in universe)
  - Drop libxtst-dev build-depends so that the (redundant) fake key presses
    for inhibiting the screensaver are disabled (LP: #1007438)
  - Build-depend on libzeitgeist-dev
  - Suggest rather than recommend gstreamer components in universe
  - Add totem-plugins-extra
  - Add XB-Npp-Description and XB-Npp-Filename header to the 
    totem-mozilla package to improve ubufox/ubuntu plugin db integration 
  - Refer to Firefox in totem-mozilla description instead of Iceweasel
  - Don't have totem-mozilla recommend any particular browser
  - Drop obsolete python library dependencies since iplayer is no longer
    included
* debian/totem-common.install, debian/source_totem.py:
  - Install Ubuntu apport debugging hook
* debian/totem-plugins-extra.install:
  - Universe plugins split out of totem-plugins (currently only gromit)
* debian/totem-plugins.install:    
  - Skip the plugins split to -extra and add the zeitgeist plugin
* debian/rules:
  - Build with --fail-missing, to ensure we install everything. 
    + Ignore libtotem.{,l}a since we delibrately don't install these.
  - Re-enable hardening, make sure both PIE and BINDNOW are used
    by setting hardening=+all. (LP: #1039604)
* debian/patches/91_quicklist_entries.patch:
  - Add static quicklist
* debian/patches/92_gst-plugins-good.patch:
  - Build without unnecessary gstreamer1.0-bad dependency
* debian/patches/93_grilo_optional.patch:
  - Allow building without grilo while grilo MIR is still pending
* debian/patches/correct_desktop_mimetypes.patch:
  - Don't list the mimetypes after the unity lists
* debian/patches/revert_shell_menu.patch: 
  - revert the use of a shell menu until indicator-appmenu can handle
    the mixed shell/traditional menus itself
* New upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
69
69
} TotemStates;
70
70
 
71
71
struct _TotemObject {
72
 
        GObject parent;
 
72
        GtkApplication parent;
73
73
 
74
74
        /* Control window */
75
75
        GtkBuilder *xml;
76
76
        GtkWidget *win;
77
77
        BaconVideoWidget *bvw;
78
78
        GtkWidget *prefs;
 
79
        GtkBuilder *prefs_xml;
79
80
        GtkWidget *statusbar;
80
81
 
81
82
        /* UI manager */
117
118
        GtkWidget *languages;
118
119
        GList *subtitles_list;
119
120
        GList *language_list;
120
 
        gboolean autoload_subs;
121
121
 
122
122
        /* Fullscreen */
123
123
        TotemFullscreen *fs;
152
152
        gint64 seek_to;
153
153
        TotemPlaylist *playlist;
154
154
        GSettings *settings;
155
 
        GtkApplication *app;
156
155
        TotemStates state;
157
156
        TotemOpenLocation *open_location;
158
157
        gboolean remember_position;
159
158
        gboolean disable_kbd_shortcuts;
 
159
        gboolean has_played_emitted;
160
160
};
161
161
 
162
162
GtkWidget *totem_volume_create (void);