Merge lp:~stipple-devs/stipple/stipple-empathy into lp:stipple

Proposed by Mitch Towner
Status: Merged
Approved by: malev
Approved revision: 18
Merged at revision: 18
Proposed branch: lp:~stipple-devs/stipple/stipple-empathy
Merge into: lp:stipple
Diff against target: 93 lines (+84/-0)
2 files modified
plugins/empathy-accounts.py (+42/-0)
plugins/empathy-logs.py (+42/-0)
To merge this branch: bzr merge lp:~stipple-devs/stipple/stipple-empathy
Reviewer Review Type Date Requested Status
Duane Hinnen Approve
malev (community) Approve
Review via email: mp+30775@code.launchpad.net

Description of the change

Added 2 separate plugins for empathy. 1 to sync account info, 1 to sync account logs. These 2 functions were originally combined into 1 plugin that didn't work due to a bug in the stipple.py code which is now fixed. Both Duane & I are undecided whether this functionality should be combined into 1 plugin or split into 2 different plugins.

The 'use case' for having 2 separate plugins is a user who wants to sync *only* their account info, not their conversation logs. Please feel free to comment with your thoughts.

To post a comment you must log in.
Revision history for this message
malev (marcosvanetta) wrote :

I like it

review: Approve
Revision history for this message
Duane Hinnen (duanedesign) wrote :

Looks good. Will approve it. I think malev and I are starting to lean towards having it in one plugin. We will merge this branch and if we decide to combine them we can do it after the merge.

review: Approve
Revision history for this message
Shashank Sahni (shredder12) wrote :

I think providing the user with options is a good idea but splitting a plugin is not. What if we could use some form of nested check buttons for this purpose. Check this http://i27.tinypic.com/16kxtts.jpg. I am not sure if this could be done in gtk; searched but couldn't find anything. Or we can go for someother UI to let user select them. Adding two separate options will just clutter the interface. Perhaps stipple could use some UI improvements at this point to improve its capabilities.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'plugins/empathy-accounts.py'
2--- plugins/empathy-accounts.py 1970-01-01 00:00:00 +0000
3+++ plugins/empathy-accounts.py 2010-07-23 13:43:41 +0000
4@@ -0,0 +1,42 @@
5+#!/usr/bin/env python
6+# -*- coding: utf-8 -*-
7+#
8+# packagesync.py - sync installed packages across several computers.
9+#
10+# Copyright 2010 Duane Hinnen, Marcos Vanetta
11+#
12+# This program is free software: you can redistribute it and/or modify it
13+# under the terms of the GNU General Public License version 3, as published
14+# by the Free Software Foundation.
15+#
16+# This program is distributed in the hope that it will be useful, but
17+# WITHOUT ANY WARRANTY; without even the implied warranties of
18+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
19+# PURPOSE. See the GNU General Public License for more details.
20+#
21+# You should have received a copy of the GNU General Public License along
22+# with this program. If not, see <http://www.gnu.org/licenses/>.
23+#
24+
25+import os
26+from core.stipple import PluginBase
27+HOME_DIR = os.path.expanduser("~")
28+EMPATHY_ACCOUNTS = HOME_DIR + "/.mission-control"
29+
30+class Plugin(PluginBase):
31+ """
32+ Empathy Accounts Sync
33+ """
34+ def __init__(self):
35+ self.name = "Empathy_Accounts"
36+ self.prog_name = "Empathy"
37+ self.record_name = self.name.lower()
38+
39+ def sync(self):
40+
41+ self.attachDirectory(EMPATHY_ACCOUNTS)
42+ return True
43+
44+ def restore(self):
45+ self.recoverDirectory(EMPATHY_ACCOUNTS)
46+ return True
47
48=== added file 'plugins/empathy-logs.py'
49--- plugins/empathy-logs.py 1970-01-01 00:00:00 +0000
50+++ plugins/empathy-logs.py 2010-07-23 13:43:41 +0000
51@@ -0,0 +1,42 @@
52+#!/usr/bin/env python
53+# -*- coding: utf-8 -*-
54+#
55+# packagesync.py - sync installed packages across several computers.
56+#
57+# Copyright 2010 Duane Hinnen, Marcos Vanetta
58+#
59+# This program is free software: you can redistribute it and/or modify it
60+# under the terms of the GNU General Public License version 3, as published
61+# by the Free Software Foundation.
62+#
63+# This program is distributed in the hope that it will be useful, but
64+# WITHOUT ANY WARRANTY; without even the implied warranties of
65+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
66+# PURPOSE. See the GNU General Public License for more details.
67+#
68+# You should have received a copy of the GNU General Public License along
69+# with this program. If not, see <http://www.gnu.org/licenses/>.
70+#
71+
72+import os
73+from core.stipple import PluginBase
74+HOME_DIR = os.path.expanduser("~")
75+EMPATHY_LOGS = HOME_DIR + "/.local/share/Empathy/logs/"
76+
77+class Plugin(PluginBase):
78+ """
79+ Empathy Logs Sync
80+ """
81+ def __init__(self):
82+ self.name = "Empathy_Logs"
83+ self.prog_name = "Empathy"
84+ self.record_name = self.name.lower()
85+
86+ def sync(self):
87+
88+ self.attachDirectory(EMPATHY_LOGS)
89+ return True
90+
91+ def restore(self):
92+ self.recoverDirectory(EMPATHY_LOGS)
93+ return True

Subscribers

People subscribed via source and target branches

to all changes: