~walkerlee/totem/pre-interview

« back to all changes in this revision

Viewing changes to src/totem-interface.c

  • 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:
289
289
        return filename;
290
290
}
291
291
 
 
292
#ifdef GDK_WINDOWING_X11
292
293
static GdkWindow *
293
294
totem_gtk_plug_get_toplevel (GtkPlug *plug)
294
295
{
320
321
        }
321
322
        while (TRUE);
322
323
}
 
324
#endif /* GDK_WINDOWING_X11 */
323
325
 
324
326
void
325
327
totem_interface_set_transient_for (GtkWindow *window, GtkWindow *parent)
326
328
{
327
 
        if (GTK_IS_PLUG (parent)) {
 
329
#ifdef GDK_WINDOWING_X11
 
330
        GdkDisplay *display;
 
331
 
 
332
        display = gdk_display_get_default ();
 
333
 
 
334
        if (GDK_IS_X11_DISPLAY (display) &&
 
335
            GTK_IS_PLUG (parent)) {
328
336
                GdkWindow *toplevel;
329
337
 
330
338
                gtk_widget_realize (GTK_WIDGET (window));
334
342
                                (gtk_widget_get_window (GTK_WIDGET (window)), toplevel);
335
343
                        g_object_unref (toplevel);
336
344
                }
337
 
        } else {
338
 
                gtk_window_set_transient_for (GTK_WINDOW (window),
339
 
                                GTK_WINDOW (parent));
 
345
                return;
340
346
        }
 
347
#endif /* GDK_WINDOWING_X11 */
 
348
 
 
349
        gtk_window_set_transient_for (GTK_WINDOW (window),
 
350
                                      GTK_WINDOW (parent));
341
351
}
342
352
 
343
353
char *