diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/no-title-bar/fix-paths.patch')
| -rw-r--r-- | infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/no-title-bar/fix-paths.patch | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/no-title-bar/fix-paths.patch b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/no-title-bar/fix-paths.patch index 9a53d63860da..fb2d3d57e51d 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/no-title-bar/fix-paths.patch +++ b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/no-title-bar/fix-paths.patch @@ -1,24 +1,44 @@ +diff --git a/decoration.js b/decoration.js +index d1ff3dd..ff4193f 100644 --- a/decoration.js +++ b/decoration.js -@@ -181,7 +181,7 @@ +@@ -223,7 +223,7 @@ var Decoration = class { + + let winId = this._guessWindowXID(win); + +- let xprops = GLib.spawn_command_line_sync(`xprop -id ${winId}`); ++ let xprops = GLib.spawn_command_line_sync(`@xprop@ -id ${winId}`); + if (!xprops[0]) { + Utils.log_debug(`Unable to determine windows '${win.get_title()}' original state`); + return win._noTitleBarOriginalState = WindowState.UNKNOWN; +@@ -237,7 +237,7 @@ var Decoration = class { + let prop = '_MOTIF_WM_HINTS'; + let value = '0x2, 0x0, %s, 0x0, 0x0'.format(hide ? '0x2' : '0x1'); + +- GLib.spawn_command_line_sync(`xprop -id ${windId} -f ${prop} 32c -set ${prop} "${value}"`); ++ GLib.spawn_command_line_sync(`@xprop@ -id ${windId} -f ${prop} 32c -set ${prop} "${value}"`); + if (!hide && !win.titlebar_is_onscreen()) { + Utils.log_debug(`Shoving titlebar onscreen for window '${win.get_title()}'`); + win.shove_titlebar_onscreen(); +@@ -354,7 +354,7 @@ var Decoration = class { let act = win.get_compositor_private(); let xwindow = act && act['x-window']; if (xwindow) { - let xwininfo = GLib.spawn_command_line_sync('xwininfo -children -id 0x%x'.format(xwindow)); + let xwininfo = GLib.spawn_command_line_sync('@xwininfo@ -children -id 0x%x'.format(xwindow)); if (xwininfo[0]) { - let str = xwininfo[1].toString(); + let str = ByteArray.toString(xwininfo[1]); -@@ -207,7 +207,7 @@ +@@ -384,7 +384,7 @@ var Decoration = class { // Try enumerating all available windows and match the title. Note that this // may be necessary if the title contains special characters and `x-window` // is not available. - let result = GLib.spawn_command_line_sync('xprop -root _NET_CLIENT_LIST'); + let result = GLib.spawn_command_line_sync('@xprop@ -root _NET_CLIENT_LIST'); if (result[0]) { - let str = result[1].toString(); + let str = ByteArray.toString(result[1]); -@@ -218,7 +218,7 @@ +@@ -395,7 +395,7 @@ var Decoration = class { // For each window ID, check if the title matches the desired title. for (var i = 0; i < windowList.length; ++i) { @@ -27,30 +47,10 @@ let result = GLib.spawn_command_line_sync(cmd); if (result[0]) { -@@ -258,7 +258,7 @@ - } - - let id = this._guessWindowXID(win); -- let cmd = 'xprop -id ' + id; -+ let cmd = '@xprop@ -id ' + id; - - let xprops = GLib.spawn_command_line_sync(cmd); - if (!xprops[0]) { -@@ -277,7 +277,7 @@ - m = str.match(/^_GTK_HIDE_TITLEBAR_WHEN_MAXIMIZED(\(CARDINAL\))? = ([0-9]+)$/m); - if (m) { - let state = !!parseInt(m[2]); -- cmd = ['xprop', '-id', id, -+ cmd = ['@xprop@', '-id', id, - '-f', '_NO_TITLE_BAR_ORIGINAL_STATE', '32c', - '-set', '_NO_TITLE_BAR_ORIGINAL_STATE', - (state ? '0x1' : '0x0')]; -@@ -358,7 +358,7 @@ - let winXID = this._guessWindowXID(win); - if (winXID == null) - return; -- let cmd = ['xprop', '-id', winXID, -+ let cmd = ['@xprop@', '-id', winXID, - '-f', '_GTK_HIDE_TITLEBAR_WHEN_MAXIMIZED', '32c', - '-set', '_GTK_HIDE_TITLEBAR_WHEN_MAXIMIZED', - (hide ? '0x1' : '0x0')]; +@@ -455,4 +455,4 @@ var Decoration = class { + let styleContent = this._updateUserStyles(); + GLib.file_set_contents(this._userStylesPath, styleContent); + } +-} +\ No newline at end of file ++} |