Skip to content

Commit

Permalink
2009-02-12 John Stowers <john.stowers@gmail.com>
Browse files Browse the repository at this point in the history
	* conduit/Main.py:
	* conduit/modules/UNSUPPORTED: Add a new directory
	in which to store unsuppored or incomplete dataproviders.
	Use -U command line switch to tell conduit to look in 
	this directory.

	* conduit/modules/RTMModule/*: Move POS remember the milk
	module to this new directory.



git-svn-id: svn+ssh://svn.gnome.org/svn/conduit/trunk@1859 1811c9d2-c306-0410-a128-ae57aa55c946
  • Loading branch information
jstowers committed Feb 12, 2009
1 parent a4ac859 commit 1044aa9
Show file tree
Hide file tree
Showing 9 changed files with 31 additions and 7 deletions.
11 changes: 11 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
2009-02-12 John Stowers <john.stowers@gmail.com>

* conduit/Main.py:
* conduit/modules/UNSUPPORTED: Add a new directory
in which to store unsuppored or incomplete dataproviders.
Use -U command line switch to tell conduit to look in
this directory.

* conduit/modules/RTMModule/*: Move POS remember the milk
module to this new directory.

2009-02-12 John Stowers <john.stowers@gmail.com>

* conduit/modules/BansheeModule/BansheeModule.py:
Expand Down
14 changes: 10 additions & 4 deletions conduit/Main.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,10 @@ def __init__(self):
"-s", "--settings",
metavar="key=val,key=val",
help="Explicitly set internal Conduit settings (keys) to the given values for this session. [default: do not set]")
parser.add_option(
"-U", "--enable-unsupported",
action="store_true", default=False,
help="Enable loading of unfinished or unsupported dataproviders. [default: %default]")
options, args = parser.parse_args()

whitelist = None
Expand Down Expand Up @@ -138,10 +142,12 @@ def __init__(self):
self.ShowStatusIcon()

#Dynamically load all datasources, datasinks and converters
dirs_to_search = [
conduit.SHARED_MODULE_DIR,
os.path.join(conduit.USER_DIR, "modules")
]
dirs_to_search = [
conduit.SHARED_MODULE_DIR,
os.path.join(conduit.USER_DIR, "modules")
]
if options.enable_unsupported:
dirs_to_search.append(os.path.join(conduit.SHARED_MODULE_DIR, "UNSUPPORTED"))

#Initialize all globals variables
conduit.GLOBALS.app = self
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
5 changes: 3 additions & 2 deletions po/POTFILES.skip
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,14 @@ conduit/modules/GoogleModule/contacts-config.glade
conduit/modules/OSyncEvoModule.py
conduit/modules/PicasaDesktopModule/PicasaDesktopModule.py
conduit/modules/PicasaDesktopModule/config.glade
conduit/modules/RTMModule/RTMModule.py
conduit/modules/RTMModule/config.glade
conduit/modules/RhythmboxDBusModule/RhythmboxDBusModule.py
conduit/modules/RhythmboxDBusModule/config.glade
conduit/modules/SynceModule.py
conduit/modules/SettingsModule/GConfUtils.py
conduit/modules/SettingsModule/layout_loader.py
conduit/modules/SettingsModule/layout_save.py
conduit/modules/UNSUPPORTED/RTMModule/RTMModule.py
conduit/modules/UNSUPPORTED/RTMModule/config.glade



6 changes: 6 additions & 0 deletions scripts/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
2009-02-12 John Stowers <john.stowers@gmail.com>

reviewed by: <delete if not using a buddy>

* update-3rdparty-libs.sh:

2009-01-23 John Stowers <john.stowers@gmail.com>

reviewed by: <delete if not using a buddy>
Expand Down
2 changes: 1 addition & 1 deletion scripts/update-3rdparty-libs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ done

#update pyrtm
echo "Updating pyrtm"
wget -qO conduit/modules/RTMModule/rtm.py "http://repo.or.cz/w/pyrtm.git?a=blob_plain;f=rtm.py;hb=HEAD
wget -qO conduit/modules/UNSUPPORTED/RTMModule/rtm.py "http://repo.or.cz/w/pyrtm.git?a=blob_plain;f=rtm.py;hb=HEAD

0 comments on commit 1044aa9

Please sign in to comment.