From 2dbf5153326b87a14ba1018dafaa882e35893a51 Mon Sep 17 00:00:00 2001 From: Walter Bender Date: Sun, 03 Feb 2013 20:20:12 +0000 Subject: moving icons to extensions; making fb a subdir --- diff --git a/configure.ac b/configure.ac index fe1c67a..f88a61e 100644 --- a/configure.ac +++ b/configure.ac @@ -65,7 +65,9 @@ extensions/cpsection/updater/Makefile extensions/deviceicon/Makefile extensions/globalkey/Makefile extensions/web/Makefile -extensions/web/facebook/Makefile +extensions/web/fb/Makefile +extensions/web/fb/facebook/Makefile +extensions/web/fb/icons/Makefile extensions/Makefile Makefile po/Makefile.in diff --git a/extensions/cpsection/facebook/model.py b/extensions/cpsection/facebook/model.py index 02ff541..1c7d2de 100644 --- a/extensions/cpsection/facebook/model.py +++ b/extensions/cpsection/facebook/model.py @@ -21,7 +21,7 @@ from gi.repository import GConf import os import time -from web import facebook_online_account as fboa +from web.fb import facebook_online_account as fboa def save_access_token(access_token, expires_in): client = GConf.Client.get_default() diff --git a/extensions/web/Makefile.am b/extensions/web/Makefile.am index 31420cd..fc4e102 100644 --- a/extensions/web/Makefile.am +++ b/extensions/web/Makefile.am @@ -1,6 +1,5 @@ -SUBDIRS = facebook +SUBDIRS = fb sugardir = $(pkgdatadir)/extensions/web sugar_PYTHON = \ - __init__.py \ - facebook_online_account.py + __init__.py diff --git a/extensions/web/facebook/Makefile.am b/extensions/web/facebook/Makefile.am deleted file mode 100644 index f6d39b6..0000000 --- a/extensions/web/facebook/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -sugardir = $(pkgdatadir)/extensions/web/facebook -sugar_PYTHON = \ - __init__.py \ - facebook.py diff --git a/extensions/web/fb/Makefile.am b/extensions/web/fb/Makefile.am new file mode 100644 index 0000000..8e1fa0a --- /dev/null +++ b/extensions/web/fb/Makefile.am @@ -0,0 +1,6 @@ +SUBDIRS = facebook icons + +sugardir = $(pkgdatadir)/extensions/web/fb +sugar_PYTHON = \ + __init__.py \ + facebook_online_account.py diff --git a/extensions/web/facebook/__init__.py b/extensions/web/fb/__init__.py index e69de29..e69de29 100644 --- a/extensions/web/facebook/__init__.py +++ b/extensions/web/fb/__init__.py diff --git a/extensions/web/fb/facebook/Makefile.am b/extensions/web/fb/facebook/Makefile.am new file mode 100644 index 0000000..cda1445 --- /dev/null +++ b/extensions/web/fb/facebook/Makefile.am @@ -0,0 +1,4 @@ +sugardir = $(pkgdatadir)/extensions/web/fb/facebook +sugar_PYTHON = \ + __init__.py \ + facebook.py diff --git a/extensions/web/facebook/__init__.py b/extensions/web/fb/facebook/__init__.py index e69de29..e69de29 100644 --- a/extensions/web/facebook/__init__.py +++ b/extensions/web/fb/facebook/__init__.py diff --git a/extensions/web/facebook/facebook.py b/extensions/web/fb/facebook/facebook.py index 48d5921..48d5921 100644 --- a/extensions/web/facebook/facebook.py +++ b/extensions/web/fb/facebook/facebook.py diff --git a/extensions/web/facebook_online_account.py b/extensions/web/fb/facebook_online_account.py index f07209d..f07209d 100644 --- a/extensions/web/facebook_online_account.py +++ b/extensions/web/fb/facebook_online_account.py diff --git a/extensions/web/fb/icons/Makefile.am b/extensions/web/fb/icons/Makefile.am new file mode 100644 index 0000000..3f41580 --- /dev/null +++ b/extensions/web/fb/icons/Makefile.am @@ -0,0 +1,11 @@ +icondir = $(pkgdatadir)/extensions/web/fb/icons + +icon_DATA = \ + facebook-like.svg \ + facebook-like-insensitive.svg \ + facebook-refresh.svg \ + facebook-refresh-insensitive.svg \ + facebook-share.svg \ + facebook-share-insensitive.svg + +EXTRA_DIST = $(icon_DATA) diff --git a/extensions/web/fb/icons/facebook-like-insensitive.svg b/extensions/web/fb/icons/facebook-like-insensitive.svg new file mode 100644 index 0000000..0b7e046 --- /dev/null +++ b/extensions/web/fb/icons/facebook-like-insensitive.svg @@ -0,0 +1,26 @@ + + +]> + + + + + + + + diff --git a/extensions/web/fb/icons/facebook-like.svg b/extensions/web/fb/icons/facebook-like.svg new file mode 100644 index 0000000..098850d --- /dev/null +++ b/extensions/web/fb/icons/facebook-like.svg @@ -0,0 +1,26 @@ + + +]> + + + + + + + + diff --git a/extensions/web/fb/icons/facebook-refresh-insensitive.svg b/extensions/web/fb/icons/facebook-refresh-insensitive.svg new file mode 100644 index 0000000..df76455 --- /dev/null +++ b/extensions/web/fb/icons/facebook-refresh-insensitive.svg @@ -0,0 +1,48 @@ + + +]> + + + + + + + + + + + + diff --git a/extensions/web/fb/icons/facebook-refresh.svg b/extensions/web/fb/icons/facebook-refresh.svg new file mode 100644 index 0000000..d5ada68 --- /dev/null +++ b/extensions/web/fb/icons/facebook-refresh.svg @@ -0,0 +1,47 @@ + + +]> + + + + + + + + + + + diff --git a/extensions/web/fb/icons/facebook-share-insensitive.svg b/extensions/web/fb/icons/facebook-share-insensitive.svg new file mode 100644 index 0000000..a9b2794 --- /dev/null +++ b/extensions/web/fb/icons/facebook-share-insensitive.svg @@ -0,0 +1,22 @@ + + +]> + + + + diff --git a/extensions/web/fb/icons/facebook-share.svg b/extensions/web/fb/icons/facebook-share.svg new file mode 100644 index 0000000..f87333f --- /dev/null +++ b/extensions/web/fb/icons/facebook-share.svg @@ -0,0 +1,22 @@ + + +]> + + + + diff --git a/src/jarabe/web/online_accounts_manager.py b/src/jarabe/web/online_accounts_manager.py index cb7a7ce..7cabadf 100644 --- a/src/jarabe/web/online_accounts_manager.py +++ b/src/jarabe/web/online_accounts_manager.py @@ -32,17 +32,21 @@ class OnlineAccountsManager(GObject.GObject): def all_accounts(cls): accounts = [] - for f in os.listdir(os.path.join(config.ext_path, 'web')): - if f.endswith('.py') and not f.startswith('__'): - module_name = f[:-3] - logging.debug("OnlineAccountsManager loading %s" % \ - (module_name)) - try: - mod = __import__('web.' + module_name, globals(), - locals(), [module_name]) - accounts.append(mod.get_account()) - except Exception: - logging.exception('Exception while loading extension:') + web_path = os.path.join(config.ext_path, 'web') + for d in os.listdir(web_path): + dir_path = os.path.join(web_path, d) + if os.path.isdir(dir_path): + for f in os.listdir(dir_path): + if f.endswith('.py') and not f.startswith('__'): + module_name = f[:-3] + logging.debug("OnlineAccountsManager loading %s" % \ + (module_name)) + try: + mod = __import__('web.' + d + '.' + module_name, globals(), + locals(), [module_name]) + accounts.append(mod.get_account()) + except Exception: + logging.exception('Exception while loading extension:') return accounts @classmethod -- cgit v0.9.1