Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/jarabe/frame/friendstray.py2
-rw-r--r--src/jarabe/model/Makefile.am10
-rw-r--r--src/jarabe/model/buddymodel.py (renamed from src/jarabe/model/BuddyModel.py)0
-rw-r--r--src/jarabe/model/friends.py (renamed from src/jarabe/model/Friends.py)2
-rw-r--r--src/jarabe/model/invites.py (renamed from src/jarabe/model/Invites.py)0
-rw-r--r--src/jarabe/model/meshmodel.py (renamed from src/jarabe/model/MeshModel.py)2
-rw-r--r--src/jarabe/model/owner.py (renamed from src/jarabe/model/Owner.py)2
-rw-r--r--src/jarabe/model/shellmodel.py6
8 files changed, 12 insertions, 12 deletions
diff --git a/src/jarabe/frame/friendstray.py b/src/jarabe/frame/friendstray.py
index 110234a..c4c925f 100644
--- a/src/jarabe/frame/friendstray.py
+++ b/src/jarabe/frame/friendstray.py
@@ -21,7 +21,7 @@ from jarabe.view import shell
from jarabe.view.buddymenu import BuddyMenu
from jarabe.frame.frameinvoker import FrameWidgetInvoker
from jarabe.model import shellmodel
-from jarabe.model.BuddyModel import BuddyModel
+from jarabe.model.buddymodel import BuddyModel
class FriendIcon(TrayIcon):
def __init__(self, buddy):
diff --git a/src/jarabe/model/Makefile.am b/src/jarabe/model/Makefile.am
index 2c4150b..78d0e58 100644
--- a/src/jarabe/model/Makefile.am
+++ b/src/jarabe/model/Makefile.am
@@ -4,13 +4,13 @@ sugardir = $(pythondir)/jarabe/model
sugar_PYTHON = \
__init__.py \
accesspointmodel.py \
- BuddyModel.py \
+ buddymodel.py \
clipboard.py \
clipboardobject.py \
- Friends.py \
- Invites.py \
- Owner.py \
- MeshModel.py \
+ friends.py \
+ invites.py \
+ owner.py \
+ meshmodel.py \
shellmodel.py \
homeactivity.py \
homemodel.py
diff --git a/src/jarabe/model/BuddyModel.py b/src/jarabe/model/buddymodel.py
index b51b808..b51b808 100644
--- a/src/jarabe/model/BuddyModel.py
+++ b/src/jarabe/model/buddymodel.py
diff --git a/src/jarabe/model/Friends.py b/src/jarabe/model/friends.py
index fc6ff65..465f0ca 100644
--- a/src/jarabe/model/Friends.py
+++ b/src/jarabe/model/friends.py
@@ -20,7 +20,7 @@ from ConfigParser import ConfigParser
import gobject
-from jarabe.model.BuddyModel import BuddyModel
+from jarabe.model.buddymodel import BuddyModel
from sugar import env
import logging
diff --git a/src/jarabe/model/Invites.py b/src/jarabe/model/invites.py
index 8bcffd2..8bcffd2 100644
--- a/src/jarabe/model/Invites.py
+++ b/src/jarabe/model/invites.py
diff --git a/src/jarabe/model/MeshModel.py b/src/jarabe/model/meshmodel.py
index 8e16c21..6eb5b84 100644
--- a/src/jarabe/model/MeshModel.py
+++ b/src/jarabe/model/meshmodel.py
@@ -20,7 +20,7 @@ from sugar.graphics.xocolor import XoColor
from sugar.presence import presenceservice
from sugar import activity
-from jarabe.model.BuddyModel import BuddyModel
+from jarabe.model.buddymodel import BuddyModel
from jarabe.model.accesspointmodel import AccessPointModel
from jarabe.hardware import hardwaremanager
from jarabe.hardware import nmclient
diff --git a/src/jarabe/model/Owner.py b/src/jarabe/model/owner.py
index 91be127..08edae1 100644
--- a/src/jarabe/model/Owner.py
+++ b/src/jarabe/model/owner.py
@@ -25,7 +25,7 @@ from sugar import env
from sugar import profile
from sugar.presence import presenceservice
from sugar import util
-from jarabe.model.Invites import Invites
+from jarabe.model.invites import Invites
class ShellOwner(gobject.GObject):
"""Class representing the owner of this machine/instance. This class
diff --git a/src/jarabe/model/shellmodel.py b/src/jarabe/model/shellmodel.py
index 0c37f35..932aca4 100644
--- a/src/jarabe/model/shellmodel.py
+++ b/src/jarabe/model/shellmodel.py
@@ -18,10 +18,10 @@ import wnck
import gobject
from sugar.presence import presenceservice
-from jarabe.model.Friends import Friends
-from jarabe.model.MeshModel import MeshModel
+from jarabe.model.friends import Friends
+from jarabe.model.meshmodel import MeshModel
from jarabe.model.homemodel import HomeModel
-from jarabe.model.Owner import ShellOwner
+from jarabe.model.owner import ShellOwner
from jarabe.model.devices.devicesmodel import DevicesModel
class ShellModel(gobject.GObject):