1 |
eva 08/05/07 23:43:30 |
2 |
|
3 |
Added: workrave-1.8.5-libsigc++-2.2.2.patch |
4 |
workrave-1.8.5-gcc43.patch |
5 |
Log: |
6 |
bump to 1.8.5. Close bug #220657, #215435 and #213430. |
7 |
(Portage version: 2.1.5_rc6) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 app-misc/workrave/files/workrave-1.8.5-libsigc++-2.2.2.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/workrave/files/workrave-1.8.5-libsigc++-2.2.2.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/workrave/files/workrave-1.8.5-libsigc++-2.2.2.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: workrave-1.8.5-libsigc++-2.2.2.patch |
16 |
=================================================================== |
17 |
diff -NrU5 workrave-1.8.5.orig/frontend/gtkmm/src/Dispatcher.cc workrave-1.8.5/frontend/gtkmm/src/Dispatcher.cc |
18 |
--- workrave-1.8.5.orig/frontend/gtkmm/src/Dispatcher.cc 2007-09-14 20:50:25.000000000 +0200 |
19 |
+++ workrave-1.8.5/frontend/gtkmm/src/Dispatcher.cc 2008-05-06 20:30:52.000000000 +0200 |
20 |
@@ -22,13 +22,11 @@ |
21 |
#include "config.h" |
22 |
#endif |
23 |
|
24 |
#include "preinclude.h" |
25 |
|
26 |
-#ifdef HAVE_GTKMM24 |
27 |
-#include <sigc++/compatibility.h> |
28 |
-#endif |
29 |
+#include <sigc++/trackable.h> |
30 |
|
31 |
#include "Dispatcher.hh" |
32 |
|
33 |
#include "nls.h" |
34 |
#include "debug.hh" |
35 |
@@ -169,11 +167,11 @@ |
36 |
send_fd = filedes[1]; |
37 |
|
38 |
fd_set_close_on_exec(receive_fd); |
39 |
fd_set_close_on_exec(send_fd); |
40 |
|
41 |
- io_connection = Glib::signal_io().connect(SigC::slot_class(*this, &Dispatcher::io_handler), |
42 |
+ io_connection = Glib::signal_io().connect(sigc::mem_fun(*this, &Dispatcher::io_handler), |
43 |
(int)receive_fd, |
44 |
Glib::IO_IN); |
45 |
|
46 |
ret = true; |
47 |
} |
48 |
@@ -240,11 +238,11 @@ |
49 |
} |
50 |
|
51 |
#endif |
52 |
|
53 |
|
54 |
-SigC::Connection |
55 |
-Dispatcher::connect(const SigC::Slot0<void>& slot) |
56 |
+sigc::connection |
57 |
+Dispatcher::connect(const sigc::slot0<void>& slot) |
58 |
{ |
59 |
return signal.connect(slot); |
60 |
} |
61 |
|
62 |
diff -NrU5 workrave-1.8.5.orig/frontend/gtkmm/src/Dispatcher.hh workrave-1.8.5/frontend/gtkmm/src/Dispatcher.hh |
63 |
--- workrave-1.8.5.orig/frontend/gtkmm/src/Dispatcher.hh 2007-09-14 20:50:25.000000000 +0200 |
64 |
+++ workrave-1.8.5/frontend/gtkmm/src/Dispatcher.hh 2008-05-06 20:33:30.000000000 +0200 |
65 |
@@ -17,13 +17,11 @@ |
66 |
// |
67 |
|
68 |
#ifndef DISPATCHER_HH |
69 |
#define DISPATCHER_HH |
70 |
|
71 |
-#ifdef HAVE_GTKMM24 |
72 |
-#include <sigc++/compatibility.h> |
73 |
-#endif |
74 |
+#include <sigc++/trackable.h> |
75 |
|
76 |
#include <sigc++/object.h> |
77 |
#include <sigc++/slot.h> |
78 |
#include <sigc++/class_slot.h> |
79 |
#include <glibmm.h> |
80 |
@@ -50,19 +48,19 @@ |
81 |
int receive_fd; |
82 |
|
83 |
#endif |
84 |
|
85 |
//! I/O Connection |
86 |
- SigC::Connection io_connection; |
87 |
+ sigc::connection io_connection; |
88 |
|
89 |
//! |
90 |
- SigC::Signal0<void> signal; |
91 |
+ sigc::signal0<void> signal; |
92 |
|
93 |
public: |
94 |
Dispatcher(); |
95 |
~Dispatcher(); |
96 |
- SigC::Connection connect(const SigC::Slot0<void>& slot); |
97 |
+ sigc::connection connect(const sigc::slot0<void>& slot); |
98 |
void send_notification(); |
99 |
|
100 |
private: |
101 |
|
102 |
#ifndef WIN32 |
103 |
diff -NrU5 workrave-1.8.5.orig/frontend/gtkmm/src/EventImage.cc workrave-1.8.5/frontend/gtkmm/src/EventImage.cc |
104 |
--- workrave-1.8.5.orig/frontend/gtkmm/src/EventImage.cc 2007-09-14 20:50:25.000000000 +0200 |
105 |
+++ workrave-1.8.5/frontend/gtkmm/src/EventImage.cc 2008-05-06 20:23:20.000000000 +0200 |
106 |
@@ -96,11 +96,10 @@ |
107 |
} |
108 |
|
109 |
return Gtk::Image::on_unmap_event(event); |
110 |
} |
111 |
|
112 |
-#ifdef HAVE_GTKMM24 |
113 |
void |
114 |
EventImage::on_size_allocate(Gtk::Allocation &allocation) |
115 |
{ |
116 |
Gtk::Image::on_size_allocate(allocation); |
117 |
|
118 |
@@ -114,23 +113,5 @@ |
119 |
allocation.get_width(), |
120 |
allocation.get_height()); |
121 |
} |
122 |
} |
123 |
|
124 |
-#else |
125 |
-void |
126 |
-EventImage::on_size_allocate(GtkAllocation *allocation) |
127 |
-{ |
128 |
- Gtk::Image::on_size_allocate(allocation); |
129 |
- |
130 |
- GtkWidget *widget = GTK_WIDGET(gobj()); |
131 |
- |
132 |
- if (GTK_WIDGET_REALIZED(widget)) |
133 |
- { |
134 |
- gdk_window_move_resize(event_window, |
135 |
- allocation->x , |
136 |
- allocation->y , |
137 |
- allocation->width, |
138 |
- allocation->height); |
139 |
- } |
140 |
-} |
141 |
-#endif |
142 |
diff -NrU5 workrave-1.8.5.orig/frontend/gtkmm/src/EventImage.hh workrave-1.8.5/frontend/gtkmm/src/EventImage.hh |
143 |
--- workrave-1.8.5.orig/frontend/gtkmm/src/EventImage.hh 2007-09-14 20:50:25.000000000 +0200 |
144 |
+++ workrave-1.8.5/frontend/gtkmm/src/EventImage.hh 2008-05-06 20:23:20.000000000 +0200 |
145 |
@@ -37,15 +37,11 @@ |
146 |
private: |
147 |
void on_realize(); |
148 |
void on_unrealize(); |
149 |
bool on_map_event(GdkEventAny *event); |
150 |
bool on_unmap_event(GdkEventAny *event); |
151 |
-#ifdef HAVE_GTKMM24 |
152 |
void on_size_allocate(Gtk::Allocation &allocation); |
153 |
-#else |
154 |
- void on_size_allocate(GtkAllocation *allocation); |
155 |
-#endif |
156 |
|
157 |
GdkWindow *event_window; |
158 |
}; |
159 |
|
160 |
|
161 |
diff -NrU5 workrave-1.8.5.orig/frontend/gtkmm/src/EventLabel.cc workrave-1.8.5/frontend/gtkmm/src/EventLabel.cc |
162 |
--- workrave-1.8.5.orig/frontend/gtkmm/src/EventLabel.cc 2007-09-14 20:50:25.000000000 +0200 |
163 |
+++ workrave-1.8.5/frontend/gtkmm/src/EventLabel.cc 2008-05-06 20:23:20.000000000 +0200 |
164 |
@@ -96,11 +96,10 @@ |
165 |
} |
166 |
|
167 |
return Gtk::Label::on_unmap_event(event); |
168 |
} |
169 |
|
170 |
-#ifdef HAVE_GTKMM24 |
171 |
void |
172 |
EventLabel::on_size_allocate(Gtk::Allocation &allocation) |
173 |
{ |
174 |
Gtk::Label::on_size_allocate(allocation); |
175 |
|
176 |
@@ -114,23 +113,5 @@ |
177 |
allocation.get_width(), |
178 |
allocation.get_height()); |
179 |
} |
180 |
} |
181 |
|
182 |
-#else |
183 |
-void |
184 |
-EventLabel::on_size_allocate(GtkAllocation *allocation) |
185 |
-{ |
186 |
- Gtk::Label::on_size_allocate(allocation); |
187 |
- |
188 |
- GtkWidget *widget = GTK_WIDGET(gobj()); |
189 |
- |
190 |
- if (GTK_WIDGET_REALIZED(widget)) |
191 |
- { |
192 |
- gdk_window_move_resize(event_window, |
193 |
- allocation->x , |
194 |
- allocation->y , |
195 |
- allocation->width, |
196 |
- allocation->height); |
197 |
- } |
198 |
-} |
199 |
-#endif |
200 |
diff -NrU5 workrave-1.8.5.orig/frontend/gtkmm/src/EventLabel.hh workrave-1.8.5/frontend/gtkmm/src/EventLabel.hh |
201 |
--- workrave-1.8.5.orig/frontend/gtkmm/src/EventLabel.hh 2007-09-14 20:50:25.000000000 +0200 |
202 |
+++ workrave-1.8.5/frontend/gtkmm/src/EventLabel.hh 2008-05-06 20:23:20.000000000 +0200 |
203 |
@@ -36,15 +36,11 @@ |
204 |
private: |
205 |
void on_realize(); |
206 |
void on_unrealize(); |
207 |
bool on_map_event(GdkEventAny *event); |
208 |
bool on_unmap_event(GdkEventAny *event); |
209 |
-#ifdef HAVE_GTKMM24 |
210 |
void on_size_allocate(Gtk::Allocation &allocation); |
211 |
-#else |
212 |
- void on_size_allocate(GtkAllocation *allocation); |
213 |
-#endif |
214 |
|
215 |
GdkWindow *event_window; |
216 |
}; |
217 |
|
218 |
|
219 |
diff -NrU5 workrave-1.8.5.orig/frontend/gtkmm/src/Frame.cc workrave-1.8.5/frontend/gtkmm/src/Frame.cc |
220 |
--- workrave-1.8.5.orig/frontend/gtkmm/src/Frame.cc 2007-09-14 20:50:25.000000000 +0200 |
221 |
+++ workrave-1.8.5/frontend/gtkmm/src/Frame.cc 2008-05-06 20:23:20.000000000 +0200 |
222 |
@@ -135,33 +135,20 @@ |
223 |
color_map->alloc_color(color_black); |
224 |
#endif |
225 |
set_frame_color(frame_color); |
226 |
} |
227 |
|
228 |
-#ifdef HAVE_GTKMM24 |
229 |
void |
230 |
Frame::on_size_request(Gtk::Requisition *requisition) |
231 |
{ |
232 |
Gtk::Widget *widget = get_child(); |
233 |
widget->size_request(*requisition); |
234 |
guint d = 2*(get_border_width()+frame_width); |
235 |
requisition->width += d; |
236 |
requisition->height += d; |
237 |
} |
238 |
-#else |
239 |
-void |
240 |
-Frame::on_size_request(GtkRequisition *requisition) |
241 |
-{ |
242 |
- Gtk::Widget *widget = get_child(); |
243 |
- widget->size_request(requisition); |
244 |
- guint d = 2*(get_border_width()+frame_width); |
245 |
- requisition->width += d; |
246 |
- requisition->height += d; |
247 |
-} |
248 |
-#endif |
249 |
|
250 |
-#ifdef HAVE_GTKMM24 |
251 |
void |
252 |
Frame::on_size_allocate(Gtk::Allocation &allocation) |
253 |
{ |
254 |
Gtk::Bin::on_size_allocate(allocation); |
255 |
|
256 |
@@ -173,47 +160,26 @@ |
257 |
alloc.set_y(allocation.get_y() + b); |
258 |
alloc.set_width(allocation.get_width() - 2*b); |
259 |
alloc.set_height(allocation.get_height() - 2*b); |
260 |
widget->size_allocate(alloc); |
261 |
} |
262 |
-#else |
263 |
-void |
264 |
-Frame::on_size_allocate(GtkAllocation* allocation) |
265 |
-{ |
266 |
- Gtk::Bin::on_size_allocate(allocation); |
267 |
- |
268 |
- Gtk::Widget *widget = get_child(); |
269 |
- guint b = get_border_width() + frame_width; |
270 |
- |
271 |
- GtkAllocation alloc; |
272 |
- alloc.x = allocation->x + b; |
273 |
- alloc.y = allocation->y + b; |
274 |
- alloc.width = allocation->width - 2*b; |
275 |
- alloc.height = allocation->height - 2*b; |
276 |
- widget->size_allocate(&alloc); |
277 |
-} |
278 |
-#endif |
279 |
|
280 |
bool |
281 |
Frame::on_expose_event(GdkEventExpose* e) |
282 |
{ |
283 |
Glib::RefPtr<Gdk::Window> window = get_window(); |
284 |
Glib::RefPtr<Gtk::Style> style = get_style(); |
285 |
|
286 |
Gdk::Color bgCol = style->get_background(Gtk::STATE_NORMAL); |
287 |
|
288 |
// FIXME: |
289 |
-#ifdef HAVE_GTKMM24 |
290 |
Gtk::Allocation gtkmmalloc = get_allocation(); |
291 |
GtkAllocation alloc; |
292 |
alloc.x = gtkmmalloc.get_x(); |
293 |
alloc.y = gtkmmalloc.get_y(); |
294 |
alloc.width = gtkmmalloc.get_width(); |
295 |
alloc.height = gtkmmalloc.get_height(); |
296 |
-#else |
297 |
- GtkAllocation alloc = get_allocation(); |
298 |
-#endif |
299 |
|
300 |
switch (frame_style) |
301 |
{ |
302 |
case STYLE_SOLID: |
303 |
gc->set_foreground(frame_visible ? frame_color : bgCol); |
304 |
@@ -256,11 +222,11 @@ |
305 |
bool rc = Gtk::Bin::on_expose_event(e); |
306 |
|
307 |
return rc; |
308 |
} |
309 |
|
310 |
-SigC::Signal1<void,bool> & |
311 |
+sigc::signal1<void,bool> & |
312 |
Frame::signal_flash() |
313 |
{ |
314 |
return flash_signal_src; |
315 |
} |
316 |
|
317 |
diff -NrU5 workrave-1.8.5.orig/frontend/gtkmm/src/Frame.hh workrave-1.8.5/frontend/gtkmm/src/Frame.hh |
318 |
--- workrave-1.8.5.orig/frontend/gtkmm/src/Frame.hh 2007-09-14 20:50:25.000000000 +0200 |
319 |
+++ workrave-1.8.5/frontend/gtkmm/src/Frame.hh 2008-05-06 20:23:20.000000000 +0200 |
320 |
@@ -35,11 +35,11 @@ |
321 |
void set_frame_width(guint width); |
322 |
void set_frame_style(Style style); |
323 |
void set_frame_color(const Gdk::Color &color); |
324 |
void set_frame_flashing(int delay); |
325 |
void set_frame_visible(bool visible); |
326 |
- SigC::Signal1<void,bool> &signal_flash(); |
327 |
+ sigc::signal1<void,bool> &signal_flash(); |
328 |
|
329 |
protected: |
330 |
bool on_timer(); |
331 |
#ifdef HAVE_GTKMM24 |
332 |
void on_size_request(Gtk::Requisition *requisition); |
333 |
@@ -76,11 +76,11 @@ |
334 |
|
335 |
//! Flash delay; |
336 |
int flash_delay; |
337 |
|
338 |
//! Flash timeout signal |
339 |
- SigC::Connection flash_signal; |
340 |
+ sigc::connection flash_signal; |
341 |
|
342 |
//! Flash signal source |
343 |
- SigC::Signal1<void,bool> flash_signal_src; |
344 |
+ sigc::signal1<void,bool> flash_signal_src; |
345 |
}; |
346 |
|
347 |
diff -NrU5 workrave-1.8.5.orig/frontend/gtkmm/src/GnomeAppletWindow.hh workrave-1.8.5/frontend/gtkmm/src/GnomeAppletWindow.hh |
348 |
--- workrave-1.8.5.orig/frontend/gtkmm/src/GnomeAppletWindow.hh 2007-09-14 20:50:25.000000000 +0200 |
349 |
+++ workrave-1.8.5/frontend/gtkmm/src/GnomeAppletWindow.hh 2008-05-06 20:23:20.000000000 +0200 |
350 |
@@ -22,13 +22,11 @@ |
351 |
#include "preinclude.h" |
352 |
#include <stdio.h> |
353 |
|
354 |
#include "AppletWindow.hh" |
355 |
|
356 |
-#ifdef HAVE_GTKMM24 |
357 |
-#include <sigc++/compatibility.h> |
358 |
-#endif |
359 |
+#include <sigc++/trackable.h> |
360 |
|
361 |
#include <gnome.h> |
362 |
#include <bonobo.h> |
363 |
#include <bonobo/bonobo-xobject.h> |
364 |
#include <string> |
365 |
@@ -43,11 +41,11 @@ |
366 |
|
367 |
class TimerBoxGtkView; |
368 |
class AppletControl; |
369 |
|
370 |
class GnomeAppletWindow : |
371 |
- public SigC::Object, |
372 |
+ public sigc::trackable, |
373 |
public AppletWindow |
374 |
{ |
375 |
public: |
376 |
GnomeAppletWindow(AppletControl *control); |
377 |
virtual ~GnomeAppletWindow(); |
378 |
diff -NrU5 workrave-1.8.5.orig/frontend/gtkmm/src/GtkUtil.cc workrave-1.8.5/frontend/gtkmm/src/GtkUtil.cc |
379 |
--- workrave-1.8.5.orig/frontend/gtkmm/src/GtkUtil.cc 2007-09-14 20:50:25.000000000 +0200 |
380 |
+++ workrave-1.8.5/frontend/gtkmm/src/GtkUtil.cc 2008-05-06 20:23:20.000000000 +0200 |
381 |
@@ -341,17 +341,12 @@ |
382 |
{ |
383 |
TRACE_ENTER("GtkUtil::center_window"); |
384 |
|
385 |
if (head.valid) |
386 |
{ |
387 |
-#ifdef HAVE_GTKMM24 |
388 |
Gtk::Requisition size; |
389 |
window.size_request(size); |
390 |
-#else |
391 |
- GtkRequisition size; |
392 |
- window.size_request(&size); |
393 |
-#endif |
394 |
|
395 |
#ifdef WIN32 |
396 |
TRACE_MSG( |
397 |
head.geometry.get_width() << "x" << head.geometry.get_height() << " +" << |
398 |
head.geometry.get_x() << "+" << head.geometry.get_y() << " " << |
399 |
diff -NrU5 workrave-1.8.5.orig/frontend/gtkmm/src/GUI.cc workrave-1.8.5/frontend/gtkmm/src/GUI.cc |
400 |
--- workrave-1.8.5.orig/frontend/gtkmm/src/GUI.cc 2007-09-14 20:50:25.000000000 +0200 |
401 |
+++ workrave-1.8.5/frontend/gtkmm/src/GUI.cc 2008-05-06 20:23:20.000000000 +0200 |
402 |
@@ -673,29 +673,21 @@ |
403 |
if (num_screens >= 1) |
404 |
{ |
405 |
for (int i = 0; i < num_screens; i++) |
406 |
{ |
407 |
Glib::RefPtr<Gdk::Screen> screen = display->get_screen(i); |
408 |
-#ifdef HAVE_GTKMM24 |
409 |
if (screen) |
410 |
-#else |
411 |
- if (!screen.is_null()) |
412 |
-#endif |
413 |
{ |
414 |
new_num_heads += screen->get_n_monitors(); |
415 |
TRACE_MSG("num monitors on screen " << i << " = " << screen->get_n_monitors()); |
416 |
} |
417 |
} |
418 |
|
419 |
for (int i = 0; i < num_screens; i++) |
420 |
{ |
421 |
Glib::RefPtr<Gdk::Screen> screen = display->get_screen(i); |
422 |
-#ifdef HAVE_GTKMM24 |
423 |
if (screen) |
424 |
-#else |
425 |
- if (!screen.is_null()) |
426 |
-#endif |
427 |
{ |
428 |
TRACE_MSG("num monitors on screen " << i << " = " << screen->get_n_monitors()); |
429 |
} |
430 |
} |
431 |
|
432 |
@@ -703,15 +695,11 @@ |
433 |
|
434 |
int count = 0; |
435 |
for (int i = 0; i < num_screens; i++) |
436 |
{ |
437 |
Glib::RefPtr<Gdk::Screen> screen = display->get_screen(i); |
438 |
-#ifdef HAVE_GTKMM24 |
439 |
if (screen) |
440 |
-#else |
441 |
- if (!screen.is_null()) |
442 |
-#endif |
443 |
{ |
444 |
int num_monitors = screen->get_n_monitors(); |
445 |
TRACE_MSG("monitors = " << num_monitors); |
446 |
for (int j = 0; j < num_monitors && count < new_num_heads; j++) |
447 |
{ |
448 |
diff -NrU5 workrave-1.8.5.orig/frontend/gtkmm/src/GUI.hh workrave-1.8.5/frontend/gtkmm/src/GUI.hh |
449 |
--- workrave-1.8.5.orig/frontend/gtkmm/src/GUI.hh 2007-09-14 20:50:25.000000000 +0200 |
450 |
+++ workrave-1.8.5/frontend/gtkmm/src/GUI.hh 2008-05-06 20:23:20.000000000 +0200 |
451 |
@@ -19,11 +19,11 @@ |
452 |
#ifndef GUI_HH |
453 |
#define GUI_HH |
454 |
|
455 |
#include "preinclude.h" |
456 |
|
457 |
-#include <sigc++/object.h> |
458 |
+#include <sigc++/trackable.h> |
459 |
#include <glibmm.h> |
460 |
|
461 |
#include <gdk/gdkevents.h> |
462 |
#include <gtkmm/tooltips.h> |
463 |
#include <gdkmm/types.h> |
464 |
@@ -63,11 +63,11 @@ |
465 |
class IConfigurator; |
466 |
|
467 |
class GUI : |
468 |
public IApp, |
469 |
public CoreEventListener, |
470 |
- public SigC::Object |
471 |
+ public sigc::trackable |
472 |
{ |
473 |
public: |
474 |
GUI(int argc, char **argv); |
475 |
virtual ~GUI(); |
476 |
|
477 |
@@ -102,11 +102,11 @@ |
478 |
enum BlockMode { BLOCK_MODE_NONE = 0, BLOCK_MODE_INPUT, BLOCK_MODE_ALL }; |
479 |
BlockMode get_block_mode(); |
480 |
void set_block_mode(BlockMode mode); |
481 |
|
482 |
// Misc |
483 |
- SigC::Signal0<void> &signal_heartbeat(); |
484 |
+ sigc::signal0<void> &signal_heartbeat(); |
485 |
HeadInfo &get_head(int head); |
486 |
int get_number_of_heads() const; |
487 |
int map_to_head(int &x, int &y); |
488 |
void map_from_head(int &x, int &y, int head); |
489 |
bool bound_head(int &x, int &y, int width, int height, int head); |
490 |
@@ -212,11 +212,11 @@ |
491 |
|
492 |
//! Tooptip manager. |
493 |
Gtk::Tooltips *tooltips; |
494 |
|
495 |
//! Heartbeat signal |
496 |
- SigC::Signal0<void> heartbeat_signal; |
497 |
+ sigc::signal0<void> heartbeat_signal; |
498 |
|
499 |
//! Destroy break window on next heartbeat? |
500 |
bool break_window_destroy; |
501 |
|
502 |
//! Destroy prelude window on next heartbeat? |
503 |
@@ -241,11 +241,11 @@ |
504 |
#ifdef HAVE_X |
505 |
//! Do we want a keyboard/pointer grab |
506 |
bool grab_wanted; |
507 |
|
508 |
//! Connection to the grab retry timeout timer. |
509 |
- SigC::Connection grab_retry_connection; |
510 |
+ sigc::connection grab_retry_connection; |
511 |
#endif |
512 |
|
513 |
//! Grab |
514 |
WindowHints::Grab *grab_handle; |
515 |
|
516 |
@@ -293,11 +293,11 @@ |
517 |
{ |
518 |
return sound_player; |
519 |
} |
520 |
|
521 |
//! Returns the GUI Heartbeat signal. |
522 |
-inline SigC::Signal0<void> & |
523 |
+inline sigc::signal0<void> & |
524 |
GUI::signal_heartbeat() |
525 |
{ |
526 |
return heartbeat_signal; |
527 |
} |
528 |
|
529 |
diff -NrU5 workrave-1.8.5.orig/frontend/gtkmm/src/IconListCellRenderer.cc workrave-1.8.5/frontend/gtkmm/src/IconListCellRenderer.cc |
530 |
--- workrave-1.8.5.orig/frontend/gtkmm/src/IconListCellRenderer.cc 2007-09-14 20:50:25.000000000 +0200 |
531 |
+++ workrave-1.8.5/frontend/gtkmm/src/IconListCellRenderer.cc 2008-05-06 20:23:20.000000000 +0200 |
532 |
@@ -107,15 +107,11 @@ |
533 |
} |
534 |
|
535 |
|
536 |
void |
537 |
IconListCellRenderer::render_vfunc( |
538 |
-#ifdef HAVE_GTKMM24 |
539 |
const Glib::RefPtr<Gdk::Drawable>& window, |
540 |
-#else |
541 |
- const Glib::RefPtr<Gdk::Window>& window, |
542 |
-#endif |
543 |
Gtk::Widget& widget, |
544 |
const Gdk::Rectangle& bg_area, |
545 |
const Gdk::Rectangle& cell_area, |
546 |
const Gdk::Rectangle& expose_area, |
547 |
Gtk::CellRendererState flags) |
548 |
diff -NrU5 workrave-1.8.5.orig/frontend/gtkmm/src/IconListCellRenderer.hh workrave-1.8.5/frontend/gtkmm/src/IconListCellRenderer.hh |
549 |
--- workrave-1.8.5.orig/frontend/gtkmm/src/IconListCellRenderer.hh 2007-09-14 20:50:25.000000000 +0200 |
550 |
+++ workrave-1.8.5/frontend/gtkmm/src/IconListCellRenderer.hh 2008-05-06 20:23:20.000000000 +0200 |
551 |
@@ -45,25 +45,16 @@ |
552 |
virtual void get_size_vfunc(Gtk::Widget& widget, |
553 |
const Gdk::Rectangle *cell_area, |
554 |
int* x_offset, int* y_offset, |
555 |
int* width, int* height); |
556 |
|
557 |
-#ifdef HAVE_GTKMM24 |
558 |
virtual void render_vfunc(const Glib::RefPtr<Gdk::Drawable>& window, |
559 |
Gtk::Widget& widget, |
560 |
const Gdk::Rectangle& background_area, |
561 |
const Gdk::Rectangle& cell_area, |
562 |
const Gdk::Rectangle& expose_area, |
563 |
Gtk::CellRendererState flags); |
564 |
-#else |
565 |
- virtual void render_vfunc(const Glib::RefPtr<Gdk::Window>& window, |
566 |
- Gtk::Widget& widget, |
567 |
- const Gdk::Rectangle& background_area, |
568 |
- const Gdk::Rectangle& cell_area, |
569 |
- const Gdk::Rectangle& expose_area, |
570 |
- Gtk::CellRendererState flags); |
571 |
-#endif |
572 |
|
573 |
private: |
574 |
void update_properties(); |
575 |
|
576 |
Gtk::CellRendererPixbuf pixbuf_renderer; |
577 |
diff -NrU5 workrave-1.8.5.orig/frontend/gtkmm/src/KdeAppletWindow.cc workrave-1.8.5/frontend/gtkmm/src/KdeAppletWindow.cc |
578 |
--- workrave-1.8.5.orig/frontend/gtkmm/src/KdeAppletWindow.cc 2007-09-14 20:50:25.000000000 +0200 |
579 |
+++ workrave-1.8.5/frontend/gtkmm/src/KdeAppletWindow.cc 2008-05-06 20:23:20.000000000 +0200 |
580 |
@@ -210,17 +210,12 @@ |
581 |
TRACE_ENTER("KdeAppletWindow::update"); |
582 |
if (applet_active) |
583 |
{ |
584 |
timer_box_control->update(); |
585 |
|
586 |
-#ifdef HAVE_GTKMM24 |
587 |
Gtk::Requisition req; |
588 |
container->size_request(req); |
589 |
-#else |
590 |
- GtkRequisition req; |
591 |
- container->size_request(&req); |
592 |
-#endif |
593 |
|
594 |
TRACE_MSG("Size = " << req.width << " " << req.height << " " << applet_orientation); |
595 |
if (req.width != last_size.width || req.height != last_size.height) |
596 |
{ |
597 |
last_size = req; |
598 |
@@ -288,15 +283,11 @@ |
599 |
{ |
600 |
TRACE_ENTER("KdeAppletWindow::on_embedded"); |
601 |
if (applet_active) |
602 |
{ |
603 |
container->set_size_request(-1,-1); |
604 |
-#ifdef HAVE_GTKMM24 |
605 |
container->size_request(last_size); |
606 |
-#else |
607 |
- container->size_request(&last_size); |
608 |
-#endif |
609 |
|
610 |
TRACE_MSG("Size = " << last_size.width << " " << last_size.height << " " << applet_orientation); |
611 |
view->set_geometry(applet_orientation, applet_size); |
612 |
|
613 |
TRACE_MSG(applet_size); |
614 |
diff -NrU5 workrave-1.8.5.orig/frontend/gtkmm/src/KdeAppletWindow.hh workrave-1.8.5/frontend/gtkmm/src/KdeAppletWindow.hh |
615 |
--- workrave-1.8.5.orig/frontend/gtkmm/src/KdeAppletWindow.hh 2007-09-14 20:50:25.000000000 +0200 |
616 |
+++ workrave-1.8.5/frontend/gtkmm/src/KdeAppletWindow.hh 2008-05-06 20:23:20.000000000 +0200 |
617 |
@@ -22,13 +22,11 @@ |
618 |
#include "preinclude.h" |
619 |
#include <stdio.h> |
620 |
|
621 |
#include "AppletWindow.hh" |
622 |
|
623 |
-#ifdef HAVE_GTKMM24 |
624 |
-#include <sigc++/compatibility.h> |
625 |
-#endif |
626 |
+#include <sigc++/trackable.h> |
627 |
|
628 |
#include <gtkmm/bin.h> |
629 |
#include <gtkmm/menu.h> |
630 |
#include <gtkmm/plug.h> |
631 |
#include <gtkmm/eventbox.h> |
632 |
@@ -36,11 +34,11 @@ |
633 |
class TimerBoxControl; |
634 |
class TimerBoxGtkView; |
635 |
class AppletControl; |
636 |
|
637 |
class KdeAppletWindow : |
638 |
- public SigC::Object, |
639 |
+ public sigc::trackable, |
640 |
public AppletWindow |
641 |
{ |
642 |
public: |
643 |
KdeAppletWindow(AppletControl *control); |
644 |
virtual ~KdeAppletWindow(); |
645 |
@@ -65,15 +63,11 @@ |
646 |
Orientation applet_orientation; |
647 |
|
648 |
//! Size of the applet |
649 |
int applet_size; |
650 |
|
651 |
-#ifdef HAVE_GTKMM24 |
652 |
Gtk::Requisition last_size; |
653 |
-#else |
654 |
- GtkRequisition last_size; |
655 |
-#endif |
656 |
|
657 |
//! |
658 |
AppletControl *control; |
659 |
|
660 |
bool applet_active; |
661 |
diff -NrU5 workrave-1.8.5.orig/frontend/gtkmm/src/KdeWorkraveControl.cc workrave-1.8.5/frontend/gtkmm/src/KdeWorkraveControl.cc |
662 |
--- workrave-1.8.5.orig/frontend/gtkmm/src/KdeWorkraveControl.cc 2007-09-14 20:50:25.000000000 +0200 |
663 |
+++ workrave-1.8.5/frontend/gtkmm/src/KdeWorkraveControl.cc 2008-05-06 20:23:20.000000000 +0200 |
664 |
@@ -22,11 +22,11 @@ |
665 |
|
666 |
#include "preinclude.h" |
667 |
|
668 |
#include <stdio.h> |
669 |
|
670 |
-#include <sigc++/object.h> |
671 |
+#include <sigc++/trackable.h> |
672 |
|
673 |
#include "GUI.hh" |
674 |
#include "KdeAppletWindow.hh" |
675 |
#include "AppletControl.hh" |
676 |
|
677 |
diff -NrU5 workrave-1.8.5.orig/frontend/gtkmm/src/KdeWorkraveControl.hh workrave-1.8.5/frontend/gtkmm/src/KdeWorkraveControl.hh |
678 |
--- workrave-1.8.5.orig/frontend/gtkmm/src/KdeWorkraveControl.hh 2007-09-14 20:50:25.000000000 +0200 |
679 |
+++ workrave-1.8.5/frontend/gtkmm/src/KdeWorkraveControl.hh 2008-05-06 20:23:20.000000000 +0200 |
680 |
@@ -21,17 +21,17 @@ |
681 |
|
682 |
#ifdef HAVE_CONFIG_H |
683 |
#include <config.h> |
684 |
#endif |
685 |
|
686 |
-#include <sigc++/object.h> |
687 |
+#include <sigc++/trackable.h> |
688 |
#include <glibmm.h> |
689 |
#include "kde_applet/kworkravecontroliface.h" |
690 |
|
691 |
class KWinModule; |
692 |
|
693 |
-class KdeWorkraveControl : public KWorkraveControlIface, public SigC::Object |
694 |
+class KdeWorkraveControl : public KWorkraveControlIface, public sigc::trackable |
695 |
{ |
696 |
public: |
697 |
void fire(); |
698 |
static void init(); |
699 |
|
700 |
diff -NrU5 workrave-1.8.5.orig/frontend/gtkmm/src/MainWindow.hh workrave-1.8.5/frontend/gtkmm/src/MainWindow.hh |
701 |
--- workrave-1.8.5.orig/frontend/gtkmm/src/MainWindow.hh 2007-09-14 20:50:25.000000000 +0200 |
702 |
+++ workrave-1.8.5/frontend/gtkmm/src/MainWindow.hh 2008-05-06 20:23:20.000000000 +0200 |
703 |
@@ -146,11 +146,11 @@ |
704 |
WPARAM wParam, LPARAM lParam); |
705 |
|
706 |
HWND win32_main_hwnd; |
707 |
HINSTANCE win32_hinstance; |
708 |
|
709 |
- SigC::Connection timeout_connection; |
710 |
+ sigc::connection timeout_connection; |
711 |
#endif |
712 |
}; |
713 |
|
714 |
|
715 |
// inline bool |
716 |
diff -NrU5 workrave-1.8.5.orig/frontend/gtkmm/src/Menus.cc workrave-1.8.5/frontend/gtkmm/src/Menus.cc |
717 |
--- workrave-1.8.5.orig/frontend/gtkmm/src/Menus.cc 2007-09-14 20:50:25.000000000 +0200 |
718 |
+++ workrave-1.8.5/frontend/gtkmm/src/Menus.cc 2008-05-06 20:23:20.000000000 +0200 |
719 |
@@ -302,15 +302,11 @@ |
720 |
// Rest break |
721 |
string rb_icon = Util::complete_directory("timer-rest-break.png", Util::SEARCH_PATH_IMAGES); |
722 |
Gtk::Image *img = manage(new Gtk::Image(rb_icon)); |
723 |
menulist.push_back(Gtk::Menu_Helpers::ImageMenuElem |
724 |
(_("_Rest break"), |
725 |
-#ifdef HAVE_GTKMM24 |
726 |
Gtk::AccelKey("<control>r"), |
727 |
-#else |
728 |
- Gtk::Menu::AccelKey("<control>r"), |
729 |
-#endif |
730 |
*img, |
731 |
MEMBER_SLOT(*this, &Menus::on_menu_restbreak_now))); |
732 |
|
733 |
#ifdef HAVE_EXERCISES |
734 |
// Exercises |
735 |
diff -NrU5 workrave-1.8.5.orig/frontend/gtkmm/src/Menus.hh workrave-1.8.5/frontend/gtkmm/src/Menus.hh |
736 |
--- workrave-1.8.5.orig/frontend/gtkmm/src/Menus.hh 2007-09-14 20:50:25.000000000 +0200 |
737 |
+++ workrave-1.8.5/frontend/gtkmm/src/Menus.hh 2008-05-06 20:23:20.000000000 +0200 |
738 |
@@ -19,13 +19,11 @@ |
739 |
#ifndef MENUS_HH |
740 |
#define MENUS_HH |
741 |
|
742 |
#include "config.h" |
743 |
|
744 |
-#ifdef HAVE_GTKMM24 |
745 |
-#include <sigc++/compatibility.h> |
746 |
-#endif |
747 |
+#include <sigc++/trackable.h> |
748 |
|
749 |
#ifdef HAVE_GNOME |
750 |
#include <gnome.h> |
751 |
#endif |
752 |
|
753 |
@@ -43,11 +41,11 @@ |
754 |
class TimerBoxAppletView; |
755 |
|
756 |
#include <gtkmm/checkmenuitem.h> |
757 |
|
758 |
class Menus : |
759 |
- public SigC::Object |
760 |
+ public sigc::trackable |
761 |
{ |
762 |
public: |
763 |
Menus(); |
764 |
~Menus(); |
765 |
|
766 |
diff -NrU5 workrave-1.8.5.orig/frontend/gtkmm/src/preinclude.h workrave-1.8.5/frontend/gtkmm/src/preinclude.h |
767 |
--- workrave-1.8.5.orig/frontend/gtkmm/src/preinclude.h 2007-09-14 20:50:25.000000000 +0200 |
768 |
+++ workrave-1.8.5/frontend/gtkmm/src/preinclude.h 2008-05-06 20:23:20.000000000 +0200 |
769 |
@@ -23,15 +23,11 @@ |
770 |
|
771 |
#ifndef NOMINMAX |
772 |
#define NOMINMAX |
773 |
#endif |
774 |
|
775 |
-#ifdef HAVE_GTKMM24 |
776 |
#define MEMBER_SLOT sigc::mem_fun |
777 |
-#else |
778 |
-#define MEMBER_SLOT SigC::slot |
779 |
-#endif |
780 |
|
781 |
|
782 |
#undef THREAD_PRIORITY_NORMAL |
783 |
#undef THREAD_PRIORITY_LOW |
784 |
#undef THREAD_PRIORITY_HIGH |
785 |
diff -NrU5 workrave-1.8.5.orig/frontend/gtkmm/src/PreludeWindow.hh workrave-1.8.5/frontend/gtkmm/src/PreludeWindow.hh |
786 |
--- workrave-1.8.5.orig/frontend/gtkmm/src/PreludeWindow.hh 2007-09-14 20:50:25.000000000 +0200 |
787 |
+++ workrave-1.8.5/frontend/gtkmm/src/PreludeWindow.hh 2008-05-06 20:23:20.000000000 +0200 |
788 |
@@ -62,11 +62,11 @@ |
789 |
void avoid_pointer(int x, int y); |
790 |
|
791 |
private: |
792 |
#ifdef WIN32 |
793 |
//! Avoid time signal |
794 |
- SigC::Connection avoid_signal; |
795 |
+ sigc::connection avoid_signal; |
796 |
#endif |
797 |
|
798 |
//! Avoid margin. |
799 |
const int SCREEN_MARGIN; |
800 |
|
801 |
diff -NrU5 workrave-1.8.5.orig/frontend/gtkmm/src/TimeEntry.hh workrave-1.8.5/frontend/gtkmm/src/TimeEntry.hh |
802 |
--- workrave-1.8.5.orig/frontend/gtkmm/src/TimeEntry.hh 2007-09-14 20:50:25.000000000 +0200 |
803 |
+++ workrave-1.8.5/frontend/gtkmm/src/TimeEntry.hh 2008-05-06 20:23:20.000000000 +0200 |
804 |
@@ -36,11 +36,11 @@ |
805 |
~TimeEntry(); |
806 |
|
807 |
time_t get_value(); |
808 |
void set_value(time_t time); |
809 |
|
810 |
- typedef SigC::Signal0<void> signal_value_changed_t; |
811 |
+ typedef sigc::signal0<void> signal_value_changed_t; |
812 |
signal_value_changed_t &signal_value_changed(); |
813 |
|
814 |
protected: |
815 |
virtual void on_changed(); |
816 |
virtual void on_value_changed(); |
817 |
diff -NrU5 workrave-1.8.5.orig/frontend/gtkmm/src/TimerBoxGtkView.cc workrave-1.8.5/frontend/gtkmm/src/TimerBoxGtkView.cc |
818 |
--- workrave-1.8.5.orig/frontend/gtkmm/src/TimerBoxGtkView.cc 2007-09-14 20:50:25.000000000 +0200 |
819 |
+++ workrave-1.8.5/frontend/gtkmm/src/TimerBoxGtkView.cc 2008-05-06 20:23:20.000000000 +0200 |
820 |
@@ -234,21 +234,14 @@ |
821 |
{ |
822 |
// Show sheep. |
823 |
rows = 1; |
824 |
} |
825 |
|
826 |
-#ifdef HAVE_GTKMM24 |
827 |
Gtk::Requisition label_size; |
828 |
Gtk::Requisition bar_size; |
829 |
|
830 |
labels[0]->size_request(label_size); |
831 |
-#else |
832 |
- GtkRequisition label_size; |
833 |
- GtkRequisition bar_size; |
834 |
- |
835 |
- labels[0]->size_request(&label_size); |
836 |
-#endif |
837 |
|
838 |
Gtk::Requisition my_size; |
839 |
size_request(my_size); |
840 |
|
841 |
for (int i = 0; i < BREAK_ID_SIZEOF; i++) |
842 |
diff -NrU5 workrave-1.8.5.orig/frontend/gtkmm/src/X11SystrayAppletWindow.cc workrave-1.8.5/frontend/gtkmm/src/X11SystrayAppletWindow.cc |
843 |
--- workrave-1.8.5.orig/frontend/gtkmm/src/X11SystrayAppletWindow.cc 2007-09-14 20:50:25.000000000 +0200 |
844 |
+++ workrave-1.8.5/frontend/gtkmm/src/X11SystrayAppletWindow.cc 2008-05-06 20:23:20.000000000 +0200 |
845 |
@@ -157,19 +157,13 @@ |
846 |
menus->create_menu(Menus::MENU_APPLET); |
847 |
|
848 |
ret = AppletWindow::APPLET_STATE_VISIBLE; |
849 |
applet_orientation = ORIENTATION_UP; |
850 |
|
851 |
-#ifdef HAVE_GTKMM24 |
852 |
Gtk::Requisition req; |
853 |
plug->size_request(req); |
854 |
applet_size = req.height; |
855 |
-#else |
856 |
- GtkRequisition req; |
857 |
- plug->size_request(&req); |
858 |
- applet_size = req.height; |
859 |
-#endif |
860 |
view->set_geometry(applet_orientation, 24); |
861 |
|
862 |
applet_active = true; |
863 |
ret = APPLET_STATE_VISIBLE; |
864 |
} |
865 |
@@ -235,17 +229,12 @@ |
866 |
{ |
867 |
TRACE_ENTER("X11SystrayAppletWindow::on_embedded"); |
868 |
|
869 |
if (applet_active) |
870 |
{ |
871 |
-#ifdef HAVE_GTKMM24 |
872 |
Gtk::Requisition req; |
873 |
plug->size_request(req); |
874 |
-#else |
875 |
- GtkRequisition req; |
876 |
- plug->size_request(&req); |
877 |
-#endif |
878 |
|
879 |
GtkOrientation o = egg_tray_icon_get_orientation(tray_icon); |
880 |
Orientation orientation; |
881 |
|
882 |
if (o == GTK_ORIENTATION_VERTICAL) |
883 |
diff -NrU5 workrave-1.8.5.orig/frontend/gtkmm/src/X11SystrayAppletWindow.hh workrave-1.8.5/frontend/gtkmm/src/X11SystrayAppletWindow.hh |
884 |
--- workrave-1.8.5.orig/frontend/gtkmm/src/X11SystrayAppletWindow.hh 2007-09-14 20:50:25.000000000 +0200 |
885 |
+++ workrave-1.8.5/frontend/gtkmm/src/X11SystrayAppletWindow.hh 2008-05-06 20:23:20.000000000 +0200 |
886 |
@@ -22,13 +22,11 @@ |
887 |
#include "preinclude.h" |
888 |
#include <stdio.h> |
889 |
|
890 |
#include "AppletWindow.hh" |
891 |
|
892 |
-#ifdef HAVE_GTKMM24 |
893 |
-#include <sigc++/compatibility.h> |
894 |
-#endif |
895 |
+#include <sigc++/trackable.h> |
896 |
|
897 |
#include <gtkmm/bin.h> |
898 |
#include <gtkmm/menu.h> |
899 |
#include <gtkmm/plug.h> |
900 |
#include <gtkmm/eventbox.h> |
901 |
@@ -38,11 +36,11 @@ |
902 |
class AppletControl; |
903 |
|
904 |
#include "eggtrayicon.h" |
905 |
|
906 |
class X11SystrayAppletWindow : |
907 |
- public SigC::Object, |
908 |
+ public sigc::trackable, |
909 |
public AppletWindow |
910 |
{ |
911 |
public: |
912 |
X11SystrayAppletWindow(AppletControl *control); |
913 |
virtual ~X11SystrayAppletWindow(); |
914 |
diff -NrU5 workrave-1.8.5.orig/frontend/plugin/distribution/gtkmm/src/NetworkPreferencePage.cc workrave-1.8.5/frontend/plugin/distribution/gtkmm/src/NetworkPreferencePage.cc |
915 |
--- workrave-1.8.5.orig/frontend/plugin/distribution/gtkmm/src/NetworkPreferencePage.cc 2007-09-14 20:50:32.000000000 +0200 |
916 |
+++ workrave-1.8.5/frontend/plugin/distribution/gtkmm/src/NetworkPreferencePage.cc 2008-05-06 20:23:20.000000000 +0200 |
917 |
@@ -351,18 +351,14 @@ |
918 |
NetworkPreferencePage::on_peer_remove() |
919 |
{ |
920 |
TRACE_ENTER("NetworkPreferencePage::on_peer_remove"); |
921 |
Glib::RefPtr<Gtk::TreeSelection> selection = peers_list->get_selection(); |
922 |
|
923 |
-#ifdef HAVE_GTKMM24 |
924 |
const Gtk::TreeSelection::SlotForeachIter& slot = |
925 |
sigc::mem_fun(*this, &NetworkPreferencePage::remove_peer); |
926 |
|
927 |
selection->selected_foreach_iter(slot); |
928 |
-#else |
929 |
- selection->selected_foreach(SigC::slot(*this, &NetworkPreferencePage::remove_peer)); |
930 |
-#endif |
931 |
|
932 |
Glib::RefPtr<Gtk::ListStore> new_store = Gtk::ListStore::create(peers_columns); |
933 |
|
934 |
typedef Gtk::TreeModel::Children type_children; |
935 |
type_children children = peers_store->children(); |
936 |
diff -NrU5 workrave-1.8.5.orig/frontend/plugin/exercises/gtkmm/src/ExercisesPanel.hh workrave-1.8.5/frontend/plugin/exercises/gtkmm/src/ExercisesPanel.hh |
937 |
--- workrave-1.8.5.orig/frontend/plugin/exercises/gtkmm/src/ExercisesPanel.hh 2007-09-14 20:50:32.000000000 +0200 |
938 |
+++ workrave-1.8.5/frontend/plugin/exercises/gtkmm/src/ExercisesPanel.hh 2008-05-06 20:23:20.000000000 +0200 |
939 |
@@ -44,11 +44,11 @@ |
940 |
public: |
941 |
ExercisesPanel(Gtk::HButtonBox *dialog_action_area); |
942 |
~ExercisesPanel(); |
943 |
|
944 |
void set_exercise_count(int num); |
945 |
- SigC::Signal0<void> &signal_stop() { return stop_signal; } |
946 |
+ sigc::signal0<void> &signal_stop() { return stop_signal; } |
947 |
|
948 |
protected: |
949 |
void on_realize(); |
950 |
|
951 |
private: |
952 |
@@ -86,16 +86,16 @@ |
953 |
Gtk::Tooltips *tooltips; |
954 |
Glib::RefPtr<Gtk::SizeGroup> size_group; |
955 |
const std::list<Exercise> exercises; |
956 |
std::list<Exercise>::const_iterator exercise_iterator; |
957 |
std::list<Exercise::Image>::const_iterator image_iterator; |
958 |
- SigC::Connection heartbeat_signal; |
959 |
+ sigc::connection heartbeat_signal; |
960 |
int exercise_time; |
961 |
int seq_time; |
962 |
bool paused; |
963 |
bool stopped; |
964 |
- SigC::Signal0<void> stop_signal; |
965 |
+ sigc::signal0<void> stop_signal; |
966 |
bool standalone; |
967 |
int exercise_num; |
968 |
int exercise_count; |
969 |
static int exercises_pointer; |
970 |
}; |
971 |
|
972 |
|
973 |
|
974 |
1.1 app-misc/workrave/files/workrave-1.8.5-gcc43.patch |
975 |
|
976 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/workrave/files/workrave-1.8.5-gcc43.patch?rev=1.1&view=markup |
977 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/workrave/files/workrave-1.8.5-gcc43.patch?rev=1.1&content-type=text/plain |
978 |
|
979 |
Index: workrave-1.8.5-gcc43.patch |
980 |
=================================================================== |
981 |
diff -NrU5 workrave-1.8.5.orig/backend/src/DBus.cc workrave-1.8.5/backend/src/DBus.cc |
982 |
--- workrave-1.8.5.orig/backend/src/DBus.cc 2008-05-06 19:59:30.000000000 +0200 |
983 |
+++ workrave-1.8.5/backend/src/DBus.cc 2008-05-06 19:57:48.000000000 +0200 |
984 |
@@ -17,10 +17,11 @@ |
985 |
static const char rcsid[] = "$Id: workrave-1.8.5-gcc43.patch,v 1.1 2008/05/07 23:43:30 eva Exp $"; |
986 |
|
987 |
#ifdef HAVE_CONFIG_H |
988 |
#include "config.h" |
989 |
#endif |
990 |
+#include <string.h> |
991 |
|
992 |
#include "nls.h" |
993 |
|
994 |
#define DBUS_API_SUBJECT_TO_CHANGE |
995 |
#include <dbus/dbus.h> |
996 |
diff -NrU5 workrave-1.8.5.orig/backend/src/GlibIniConfigurator.cc workrave-1.8.5/backend/src/GlibIniConfigurator.cc |
997 |
--- workrave-1.8.5.orig/backend/src/GlibIniConfigurator.cc 2008-05-06 19:59:30.000000000 +0200 |
998 |
+++ workrave-1.8.5/backend/src/GlibIniConfigurator.cc 2008-05-06 19:57:48.000000000 +0200 |
999 |
@@ -20,10 +20,11 @@ |
1000 |
#include "config.h" |
1001 |
#endif |
1002 |
|
1003 |
#include "debug.hh" |
1004 |
|
1005 |
+#include <string.h> |
1006 |
#include <sstream> |
1007 |
#include <assert.h> |
1008 |
#include <iostream> |
1009 |
#include <fstream> |
1010 |
|
1011 |
diff -NrU5 workrave-1.8.5.orig/backend/src/Statistics.hh workrave-1.8.5/backend/src/Statistics.hh |
1012 |
--- workrave-1.8.5.orig/backend/src/Statistics.hh 2007-09-14 20:50:38.000000000 +0200 |
1013 |
+++ workrave-1.8.5/backend/src/Statistics.hh 2008-05-06 19:57:48.000000000 +0200 |
1014 |
@@ -21,10 +21,11 @@ |
1015 |
|
1016 |
#include <iostream> |
1017 |
#include <fstream> |
1018 |
#include <vector> |
1019 |
#include <time.h> |
1020 |
+#include <string.h> |
1021 |
|
1022 |
class TimePred; |
1023 |
class IBreak; |
1024 |
class ITimer; |
1025 |
class PacketBuffer; |
1026 |
diff -NrU5 workrave-1.8.5.orig/backend/src/XMLConfigurator.cc workrave-1.8.5/backend/src/XMLConfigurator.cc |
1027 |
--- workrave-1.8.5.orig/backend/src/XMLConfigurator.cc 2008-05-06 19:59:30.000000000 +0200 |
1028 |
+++ workrave-1.8.5/backend/src/XMLConfigurator.cc 2008-05-06 19:57:48.000000000 +0200 |
1029 |
@@ -21,10 +21,11 @@ |
1030 |
#endif |
1031 |
|
1032 |
#include "debug.hh" |
1033 |
#include <sstream> |
1034 |
#include <iostream> |
1035 |
+#include <stdlib.h> |
1036 |
|
1037 |
#include "XMLConfigurator.hh" |
1038 |
|
1039 |
using namespace std; |
1040 |
|
1041 |
diff -NrU5 workrave-1.8.5.orig/frontend/plugin/exercises/common/src/Exercise.cc workrave-1.8.5/frontend/plugin/exercises/common/src/Exercise.cc |
1042 |
--- workrave-1.8.5.orig/frontend/plugin/exercises/common/src/Exercise.cc 2007-09-14 20:50:35.000000000 +0200 |
1043 |
+++ workrave-1.8.5/frontend/plugin/exercises/common/src/Exercise.cc 2008-05-06 19:57:48.000000000 +0200 |
1044 |
@@ -27,10 +27,12 @@ |
1045 |
#include "debug.hh" |
1046 |
|
1047 |
#include <unistd.h> |
1048 |
#include <assert.h> |
1049 |
#include <stdio.h> |
1050 |
+#include <string.h> |
1051 |
+#include <stdlib.h> |
1052 |
|
1053 |
#include <glib.h> |
1054 |
|
1055 |
struct ExerciseParser |
1056 |
{ |
1057 |
diff -NrU5 workrave-1.8.5.orig/frontend/plugin/exercises/gtkmm/src/ExercisesPanel.cc workrave-1.8.5/frontend/plugin/exercises/gtkmm/src/ExercisesPanel.cc |
1058 |
--- workrave-1.8.5.orig/frontend/plugin/exercises/gtkmm/src/ExercisesPanel.cc 2007-09-14 20:50:32.000000000 +0200 |
1059 |
+++ workrave-1.8.5/frontend/plugin/exercises/gtkmm/src/ExercisesPanel.cc 2008-05-06 19:57:48.000000000 +0200 |
1060 |
@@ -20,10 +20,11 @@ |
1061 |
|
1062 |
#ifdef HAVE_EXERCISES |
1063 |
|
1064 |
#include "preinclude.h" |
1065 |
|
1066 |
+#include <string.h> |
1067 |
#include <gtkmm/stock.h> |
1068 |
|
1069 |
#include "ExercisesPanel.hh" |
1070 |
#include "GtkUtil.hh" |
1071 |
#include "GUI.hh" |
1072 |
|
1073 |
|
1074 |
|
1075 |
-- |
1076 |
gentoo-commits@l.g.o mailing list |