Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAneesh Dogra <lionaneesh@gmail.com>2012-12-16 09:04:07 (GMT)
committer Aneesh Dogra <lionaneesh@gmail.com>2012-12-16 09:06:04 (GMT)
commit0baa8ea202a2e389331c6bf00e0065a4a6804b2b (patch)
tree53132fbbdbeda0172175624eaf25756478fd142d
parent8e247ebf1553e35de8988aec672ab73b0fe4418a (diff)
Fix MiniChat (Hippo Version) and delete the minichat.css from Minichat (Gtk3 version).
-rw-r--r--MiniChat/activity/activity.info2
-rw-r--r--MiniChat/activity/activity.info~9
-rw-r--r--MiniChat/minichat.py4
-rw-r--r--MiniChat_gtk3/minichat.css3
4 files changed, 4 insertions, 14 deletions
diff --git a/MiniChat/activity/activity.info b/MiniChat/activity/activity.info
index 689414c..6482f9d 100644
--- a/MiniChat/activity/activity.info
+++ b/MiniChat/activity/activity.info
@@ -1,6 +1,6 @@
[Activity]
name = Mini Chat
-service_name = net.flossmanuals.MiniChat
+bundle_id = net.flossmanuals.MiniChat
icon = chat
exec = sugar-activity minichat.MiniChat
show_launcher = yes
diff --git a/MiniChat/activity/activity.info~ b/MiniChat/activity/activity.info~
deleted file mode 100644
index 8355763..0000000
--- a/MiniChat/activity/activity.info~
+++ /dev/null
@@ -1,9 +0,0 @@
-[Activity]
-name = MiniChat
-service_name = net.flossmanuals.MiniChat
-icon = chat
-exec = sugar-activity ReadEtextsActivity4.ReadEtextsActivity
-show_launcher = no
-mime_types = text/plain;application/zip
-activity_version = 1
-license = GPLv2+
diff --git a/MiniChat/minichat.py b/MiniChat/minichat.py
index ce48cea..5830933 100644
--- a/MiniChat/minichat.py
+++ b/MiniChat/minichat.py
@@ -22,6 +22,7 @@ import pango
import logging
from sugar.activity.activity import Activity, ActivityToolbox, SCOPE_PRIVATE
from sugar.graphics.alert import NotifyAlert
+from sugar.presence.presenceservice import PresenceService
from sugar.graphics.style import (Color, COLOR_BLACK, COLOR_WHITE,
COLOR_BUTTON_GREY, FONT_BOLD, FONT_NORMAL)
from sugar.graphics.roundbox import CanvasRoundBox
@@ -47,7 +48,8 @@ class MiniChat(Activity):
self.set_toolbox(toolbox)
toolbox.show()
- self.owner = self._pservice.get_owner()
+ self.pservice = PresenceService()
+ self.owner = self.pservice.get_owner()
# Auto vs manual scrolling:
self._scroll_auto = True
self._scroll_value = 0.0
diff --git a/MiniChat_gtk3/minichat.css b/MiniChat_gtk3/minichat.css
deleted file mode 100644
index beb6720..0000000
--- a/MiniChat_gtk3/minichat.css
+++ /dev/null
@@ -1,3 +0,0 @@
-GtkTextView {
- background: rgb(235, 241, 245);
-}