1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
|
diff -Nur gnome-pomodoro-0.11.1.orig/data/org.gnome.pomodoro.gschema.xml.in gnome-pomodoro-0.11.1/data/org.gnome.pomodoro.gschema.xml.in
--- gnome-pomodoro-0.11.1.orig/data/org.gnome.pomodoro.gschema.xml.in 2015-10-24 14:24:33.000000000 -0300
+++ gnome-pomodoro-0.11.1/data/org.gnome.pomodoro.gschema.xml.in 2015-11-30 15:28:22.605008894 -0300
@@ -208,40 +208,4 @@
</key>
</schema>
- <schema id="org.gnome.pomodoro.plugins.skype" path="/org/gnome/pomodoro/plugins/skype/">
- <key name="enabled" type="b">
- <default>false</default>
- <summary>Enabled</summary>
- <description>Whether plugin is enabled.</description>
- </key>
- <key name="set-custom-status" type="b">
- <default>false</default>
- <summary>Set custom status</summary>
- <description>Whether plugin should set custom presence status.</description>
- </key>
- <key name="presence-during-pomodoro" type="s">
- <choices>
- <choice value=""/>
- <choice value="available"/>
- <choice value="invisible"/>
- <choice value="busy"/>
- <choice value="idle"/>
- </choices>
- <default>"busy"</default>
- <summary>Presence during pomodoro</summary>
- <description>Presence during pomodoro.</description>
- </key>
- <key name="presence-during-break" type="s">
- <choices>
- <choice value=""/>
- <choice value="available"/>
- <choice value="invisible"/>
- <choice value="busy"/>
- <choice value="idle"/>
- </choices>
- <default>"available"</default>
- <summary>Presence during break</summary>
- <description>Presence during break.</description>
- </key>
- </schema>
</schemalist>
diff -Nur gnome-pomodoro-0.11.1.orig/lib/Makefile.am gnome-pomodoro-0.11.1/lib/Makefile.am
--- gnome-pomodoro-0.11.1.orig/lib/Makefile.am 2015-10-24 14:24:33.000000000 -0300
+++ gnome-pomodoro-0.11.1/lib/Makefile.am 2015-11-30 15:24:53.841977378 -0300
@@ -23,8 +23,6 @@
screensaver-module.vala \
service.vala \
settings.vala \
- skype.vala \
- skype-plugin.vala \
sound-chooser-button.vala \
sounds-module.vala \
symbolic-button.vala \
diff -Nur gnome-pomodoro-0.11.1.orig/lib/preferences-dialog.vala gnome-pomodoro-0.11.1/lib/preferences-dialog.vala
--- gnome-pomodoro-0.11.1.orig/lib/preferences-dialog.vala 2015-10-24 14:24:33.000000000 -0300
+++ gnome-pomodoro-0.11.1/lib/preferences-dialog.vala 2015-11-30 15:27:33.987411057 -0300
@@ -368,7 +368,6 @@
this.setup_header_bar ();
this.setup_default_view ();
- this.setup_skype_view ();
this.setup_telepathy_view ();
this.stack.set_visible_child_name ("default");
@@ -618,102 +617,6 @@
}
}
- private void setup_skype_view ()
- {
- var plugin = this.presence_module.get_plugin_by_name ("skype")
- as Pomodoro.SkypePlugin;
-
- var list_box = new Gtk.ListBox ();
- list_box.set_selection_mode (Gtk.SelectionMode.NONE);
- list_box.set_activate_on_single_click (true);
- list_box.set_header_func (list_box_separator_func);
- list_box.can_focus = false;
- list_box.show ();
-
- var box = new Gtk.Box (Gtk.Orientation.VERTICAL, 6);
- box.set_margin_left (20);
- box.set_margin_right (20);
- box.set_margin_top (12);
- box.set_margin_bottom (12);
-
- var grid = new Gtk.Grid ();
- grid.set_margin_left (24);
- grid.set_margin_top (6);
- grid.set_margin_bottom (12);
- grid.set_column_spacing (6);
- grid.set_row_spacing (12);
-
- var grid_row = 0;
-
- var custom_status_checkbutton = new Gtk.CheckButton.with_label (_("Set custom status"));
- custom_status_checkbutton.halign = Gtk.Align.START;
-
- var pomodoro_presence_label = new Gtk.Label (_("Status during pomodoro"));
- pomodoro_presence_label.halign = Gtk.Align.START;
- pomodoro_presence_label.hexpand = true;
-
- var pomodoro_presence = this.create_presence_status_combo_box ();
-
- var break_presence_label = new Gtk.Label (_("Status during break"));
- break_presence_label.halign = Gtk.Align.START;
- break_presence_label.hexpand = true;
-
- var break_presence = this.create_presence_status_combo_box ();
-
- var authenticate_button = new Gtk.Button.with_label (_("Authenticate"));
- authenticate_button.halign = Gtk.Align.START;
- authenticate_button.hexpand = false;
-
- authenticate_button.clicked.connect (() => {
- plugin.authenticate ();
- });
-
- box.pack_start (custom_status_checkbutton, false, false, 0);
-
- grid.attach (pomodoro_presence_label, 0, grid_row, 1, 1);
- grid.attach (pomodoro_presence, 1, grid_row, 1, 1);
- grid_row += 1;
-
- grid.attach (break_presence_label, 0, grid_row, 1, 1);
- grid.attach (break_presence, 1, grid_row, 1, 1);
- grid_row += 1;
-
- box.pack_start (grid, false, true, 0);
-
- // box.pack_start (authenticate_button, false, false, 0);
-
- box.show_all ();
-
- this.stack.add_named (box, "skype");
-
- plugin.settings.bind_with_mapping ("presence-during-pomodoro",
- pomodoro_presence,
- "value",
- SETTINGS_BIND_FLAGS,
- (SettingsBindGetMappingShared) get_presence_status_mapping,
- (SettingsBindSetMappingShared) set_presence_status_mapping,
- null,
- null);
-
- plugin.settings.bind_with_mapping ("presence-during-break",
- break_presence,
- "value",
- SETTINGS_BIND_FLAGS,
- (SettingsBindGetMappingShared) get_presence_status_mapping,
- (SettingsBindSetMappingShared) set_presence_status_mapping,
- null,
- null);
- plugin.settings.bind ("set-custom-status",
- custom_status_checkbutton,
- "active",
- SETTINGS_BIND_FLAGS);
-
- plugin.settings.bind ("set-custom-status",
- grid,
- "sensitive",
- GLib.SettingsBindFlags.GET);
- }
-
private void setup_telepathy_view ()
{
var plugin = this.presence_module.get_plugin_by_name ("telepathy")
diff -Nur gnome-pomodoro-0.11.1.orig/lib/presence-module.vala gnome-pomodoro-0.11.1/lib/presence-module.vala
--- gnome-pomodoro-0.11.1.orig/lib/presence-module.vala 2015-10-24 14:24:33.000000000 -0300
+++ gnome-pomodoro-0.11.1/lib/presence-module.vala 2015-11-30 15:26:39.433437824 -0300
@@ -178,15 +178,6 @@
GLib.SettingsBindFlags.NO_SENSITIVITY);
this.plugins.append (telepathy_plugin);
- var skype_plugin = new Pomodoro.SkypePlugin ();
- skype_plugin.settings.bind ("enabled",
- skype_plugin,
- "enabled",
- GLib.SettingsBindFlags.GET |
- GLib.SettingsBindFlags.DEFAULT |
- GLib.SettingsBindFlags.NO_SENSITIVITY);
- this.plugins.append (skype_plugin);
-
// this.enable_plugins ();
this.timer.state_changed.connect (this.on_timer_state_changed);
diff -Nur gnome-pomodoro-0.11.1.orig/po/POTFILES.in gnome-pomodoro-0.11.1/po/POTFILES.in
--- gnome-pomodoro-0.11.1.orig/po/POTFILES.in 2015-10-24 14:24:33.000000000 -0300
+++ gnome-pomodoro-0.11.1/po/POTFILES.in 2015-11-30 15:29:01.523084849 -0300
@@ -33,8 +33,6 @@
lib/screensaver-module.vala
lib/service.vala
lib/settings.vala
-lib/skype-plugin.vala
-lib/skype.vala
lib/sound-chooser-button.vala
lib/sounds-module.vala
lib/symbolic-button.vala
diff -Nur gnome-pomodoro-0.11.1.orig/po/POTFILES.skip gnome-pomodoro-0.11.1/po/POTFILES.skip
--- gnome-pomodoro-0.11.1.orig/po/POTFILES.skip 2015-10-24 14:24:33.000000000 -0300
+++ gnome-pomodoro-0.11.1/po/POTFILES.skip 2015-11-30 15:28:46.903807716 -0300
@@ -21,8 +21,6 @@
lib/screensaver-module.c
lib/service.c
lib/settings.c
-lib/skype-plugin.c
-lib/skype.c
lib/sound-chooser-button.c
lib/sounds-module.c
lib/symbolic-button.c
|
