Work with both installed sugar and devel sources
This commit is contained in:
parent
f56c3d4510
commit
699bb17627
@ -11,9 +11,13 @@ import gtk
|
|||||||
import geckoembed
|
import geckoembed
|
||||||
|
|
||||||
import sys
|
import sys
|
||||||
import activity
|
|
||||||
|
|
||||||
from sugar_globals import *
|
try:
|
||||||
|
import activity
|
||||||
|
from sugar_globals import *
|
||||||
|
except ImportError:
|
||||||
|
from sugar import activity
|
||||||
|
from sugar.sugar_globals import *
|
||||||
|
|
||||||
class AddressToolbar(gtk.Toolbar):
|
class AddressToolbar(gtk.Toolbar):
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
|
@ -14,7 +14,12 @@ import os
|
|||||||
import pwd
|
import pwd
|
||||||
import socket
|
import socket
|
||||||
|
|
||||||
import activity
|
try:
|
||||||
|
import activity
|
||||||
|
from sugar_globals import *
|
||||||
|
except ImportError:
|
||||||
|
from sugar import activity
|
||||||
|
from sugar.sugar_globals import *
|
||||||
|
|
||||||
import presence
|
import presence
|
||||||
import BuddyList
|
import BuddyList
|
||||||
@ -22,8 +27,6 @@ import network
|
|||||||
import richtext
|
import richtext
|
||||||
import xmlrpclib
|
import xmlrpclib
|
||||||
|
|
||||||
from sugar_globals import *
|
|
||||||
|
|
||||||
|
|
||||||
class Chat(activity.Activity):
|
class Chat(activity.Activity):
|
||||||
def __init__(self, controller):
|
def __init__(self, controller):
|
||||||
|
Loading…
Reference in New Issue
Block a user