← Back to branch summary

~ubuntu-branches/ubuntu/trusty/xfdesktop4/trusty

« back to all changes in this revision

Viewing changes to debian/patches/xubuntu_improve-nautilus-interactions.patch

  • Committer: Package Import Robot
  • Author(s): Jackson Doak
  • Date: 2014-02-20 15:59:49 UTC
  • mfrom: (3.1.12 experimental)
  • Revision ID: package-import@ubuntu.com-20140220155949-otru8spst206sai0
Tags: 4.11.3-1ubuntu1
* Merge from debian. Remaining changes:
  - debian/patches/xubuntu_improve-nautilus-interactions.patch: added,
    should prevent nautilus from taking over the desktop if xfdesktop is
    running (and vice-versa).
  - debian/patches/xubuntu_set-accountsservice-user-bg.patch: update the
    user background property of Accountsservice on backdrop change.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/xubuntu_improve-nautilus-interactions.patch
17
17
 
18
18
--- a/src/xfce-desktop.c
19
19
+++ b/src/xfce-desktop.c
20
 
@@ -800,8 +800,8 @@ screen_set_selection(XfceDesktop *deskto
 
20
@@ -802,8 +802,8 @@ screen_set_selection(XfceDesktop *deskto
21
21
 {
22
22
     Window xwin;
23
23
     gint xscreen;
28
28
     
29
29
     xwin = GDK_WINDOW_XID(gtk_widget_get_window(GTK_WIDGET(desktop)));
30
30
     xscreen = gdk_screen_get_number(desktop->priv->gscreen);
31
 
@@ -810,6 +810,9 @@ screen_set_selection(XfceDesktop *deskto
 
31
@@ -812,6 +812,9 @@ screen_set_selection(XfceDesktop *deskto
32
32
     selection_atom = XInternAtom(gdk_x11_get_default_xdisplay(), selection_name, False);
33
33
     manager_atom = XInternAtom(gdk_x11_get_default_xdisplay(), "MANAGER", False);
34
34
 
38
38
     /* the previous check in src/main.c occurs too early, so workaround by
39
39
      * adding this one. */
40
40
    if(XGetSelectionOwner(gdk_x11_get_default_xdisplay(), selection_atom) != None) {
41
 
@@ -817,8 +820,16 @@ screen_set_selection(XfceDesktop *deskto
 
41
@@ -819,8 +822,16 @@ screen_set_selection(XfceDesktop *deskto
42
42
        exit(0);
43
43
    }
44
44