Skip to content

Commit

Permalink
Fix: Run from anywhere
Browse files Browse the repository at this point in the history
  • Loading branch information
Youssef Abou-Kewik committed Jul 20, 2015
1 parent 2c8e956 commit 966f285
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 7 deletions.
2 changes: 0 additions & 2 deletions meld/meldwindow.py
Original file line number Diff line number Diff line change
Expand Up @@ -253,12 +253,10 @@ def app_action(*args):
self.widget.connect('focus_out_event', self.on_focus_change)

if is_darwin():
print "Will setup MAC integration..."
self.osx_ready = False
self.widget.connect('window_state_event', self.osx_menu_setup)

def osx_menu_setup(self, widget, event, callback_data=None):
print "osx_menu_setup..."
if self.osx_ready == False:
from gi.repository import GtkosxApplication as gtkosx_application
self.macapp = gtkosx_application.Application()
Expand Down
7 changes: 2 additions & 5 deletions osx/Meld
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,8 @@
EXEC="exec"

name="`basename $0`"
if [[ "$0" == `pwd`* ]] || [[ "$0" == "//"* ]]; then
full_path="$0"
else
full_path="`pwd`/$0"
fi
full_path="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/$name"

tmp=`dirname "$full_path"`
tmp=`dirname "$tmp"`
bundle=`dirname "$tmp"`
Expand Down

0 comments on commit 966f285

Please sign in to comment.