brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not use libgnome-shell.la for mutter plugin

Browse Source 
Unless we're running gnome-shell from the source directory, we shouldn't
use the .la file as the mutter plugin. Instead, we use the dynamic
library.

Closes: bgo#581327
This commit is contained in:
Vincent Untz 2009-05-05 16:02:39 +02:00
parent dedc1e096a
commit ff9a42c9b6
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/gnome-shell.in
View File

@ -120,15 +120,15 @@ def start_shell():
if os.path.exists(os.path.join(bin_dir, 'gnome-shell.in')): if os.path.exists(os.path.join(bin_dir, 'gnome-shell.in')):
running_from_source_tree = True running_from_source_tree = True
top_dir = os.path.dirname(bin_dir) top_dir = os.path.dirname(bin_dir)
plugin_dir = os.path.join(top_dir, "src") plugin = os.path.join(top_dir, 'src', 'libgnome-shell.la')
typelib_dir = os.path.join(top_dir, "src") typelib_dir = os.path.join(top_dir, "src")
taskpanel_dir = os.path.join(top_dir, "src") taskpanel_dir = os.path.join(top_dir, "src")
js_dir = os.path.join(top_dir, "js") js_dir = os.path.join(top_dir, "js")
data_dir = os.path.join(top_dir, "data") data_dir = os.path.join(top_dir, "data")
else: else:
running_from_source_tree = False running_from_source_tree = False
plugin = 'libgnome-shell'
js_dir = os.path.join('@pkgdatadir@', 'js') js_dir = os.path.join('@pkgdatadir@', 'js')
plugin_dir = '@libdir@/metacity/plugins/clutter'
taskpanel_dir = '@libexecdir@' taskpanel_dir = '@libexecdir@'
# Set up environment # Set up environment
@ -184,7 +184,6 @@ def start_shell():
else: else:
args = [] args = []
plugin = os.path.join(plugin_dir, "libgnome-shell.la")
args.extend(['metacity', '--mutter-plugins=' + plugin, '--replace']) args.extend(['metacity', '--mutter-plugins=' + plugin, '--replace'])
if options.sync: if options.sync:
args.append('--sync') args.append('--sync')