Attachment #44275 for bug #69824

View | Details | Raw Unified | Return to bug 69824
Collapse All | Expand All

Line Link Here

(-)file_not_specified_in_diff (-5 / +11 lines)
0	-- meld	0	++ meld
Lines 52-57 Link Here
52	print "Due to incompatible API changes some functions may not operate as expected."	52	print "Due to incompatible API changes some functions may not operate as expected."
53		53
54	#	54	#
		55	# Add the library path to the system load path
		56	#
		57	import os
		58	sys.path = [os.curdir, '/usr/lib/meld'] + sys.path
		59
		60	#
55	# main	61	# main
56	#	62	#
57	import meldapp	63	import meldapp
58	-- meld.desktop	64	++ meld.desktop
Lines 6-11 Link Here
6	Comment=Compare and merge your files.	6	Comment=Compare and merge your files.
7	TryExec=meld	7	TryExec=meld
8	Exec=meld	8	Exec=meld
9	Path=./meld
10	Terminal=false	9	Terminal=false
11	Categories=GNOME;Application;Development;	10	Categories=GNOME;Application;Development;
12	-- meldapp.py	11	Icon=/usr/share/meld/glade2/pixmaps/icon.png
		12	++ meldapp.py
Lines 453-459 Link Here
453	gnome.url_show("http://meld.sourceforge.net")	453	gnome.url_show("http://meld.sourceforge.net")
454		454
455	def on_menu_users_manual_activate(self, button):	455	def on_menu_users_manual_activate(self, button):
456	gnome.url_show("file:///"+os.path.abspath(misc.appdir("manual/index.html") ) )	456	gnome.url_show("file:///usr/share/doc/meld-0.9.0/html/index.html")
457		457
458	def on_menu_about_activate(self, *extra):	458	def on_menu_about_activate(self, *extra):
459	about = gtk.glade.XML(misc.appdir("glade2/meld-app.glade"),"about").get_widget("about")	459	about = gtk.glade.XML(misc.appdir("glade2/meld-app.glade"),"about").get_widget("about")




    return ret

def appdir(pathin):
    return os.path.join( "/usr/share/meld", pathin )
    """
    where = os.path.dirname(sys.argv[0])
    pathout = os.path.join( where, pathin )
    if not os.path.exists(pathout):
        run_dialog(_("Cannot find '%s'\nI looked in '%s'\n(%s)") % (pathin,where,pathout), None, gtk.MESSAGE_ERROR)
        sys.exit(1)
    return pathout

class struct:
    """Similar to a dictionary except that members may be accessed as s.member.

Lines 27-33 Link Here

(-)GNUmakefile.org (-1 / +1 lines)
27		27
28	.PHONY:check	28	.PHONY:check
29	check:	29	check:
30	@check_release	30	./check_release
31		31
32	.PHONY:gettext	32	.PHONY:gettext
33	gettext:	33	gettext:

Lines 5-11 Link Here

(-)GNUmakefile.org (-1 / +1 lines)
5	RELEASE := meld-$(VERSION)	5	RELEASE := meld-$(VERSION)
6		6
7	.PHONY:run	7	.PHONY:run
8	run : check rundiff	8	run : check
9	@echo	9	@echo
10		10
11	.PHONY:rundiff	11	.PHONY:rundiff

Return to bug 69824

Lines 55-68 Link Here

(-)misc.py (-8 / +1 lines)
55	return ret	55	return ret
56		56
57	def appdir(pathin):	57	def appdir(pathin):
58	"""Return where the application is installed.	58	return os.path.join( "/usr/share/meld", pathin )
59	"""
60	where = os.path.dirname(sys.argv[0])
61	pathout = os.path.join( where, pathin )
62	if not os.path.exists(pathout):
63	run_dialog(_("Cannot find '%s'\nI looked in '%s'\n(%s)") % (pathin,where,pathout), None, gtk.MESSAGE_ERROR)
64	sys.exit(1)
65	return pathout
66		59
67	class struct:	60	class struct:
68	"""Similar to a dictionary except that members may be accessed as s.member.	61	"""Similar to a dictionary except that members may be accessed as s.member.