blob: 19ac5da3b78c1f14f6b2f13ffa91cd5efd30e41f (
plain)
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
|
diff -NurdpB workrave-1.8.4/common/include/nls.h workrave-1.8.4-patched/common/include/nls.h
--- workrave-1.8.4/common/include/nls.h 2007-03-04 13:56:45.000000000 -0500
+++ workrave-1.8.4-patched/common/include/nls.h 2007-03-15 17:59:05.000000000 -0500
@@ -25,28 +25,23 @@
#ifndef WORKRAVE_NLS_H
#define WORKRAVE_NLS_H
-#ifdef HAVE_GNOME
-# include <gnome.h>
-#else
-# ifdef ENABLE_NLS
-# include <locale.h>
-# include <libintl.h>
-# define _(String) gettext (String)
-# ifdef gettext_noop
-# define N_(String) gettext_noop (String)
-# else
-# define N_(String) (String)
-# endif
+#ifdef ENABLE_NLS
+# ifdef HAVE_GNOME
+# include <gnome.h>
# else
-/* Stubs that do something close enough. */
-# define textdomain(String) (String)
-# define gettext(String) (String)
-# define dgettext(Domain,Message) (Message)
-# define dcgettext(Domain,Message,Type) (Message)
-# define bindtextdomain(Domain,Directory) (Domain)
-# define _(String) (String)
+# include <locale.h>
+# include <libintl.h>
+# define _(String) gettext (String)
+# ifdef gettext_noop
+# define N_(String) gettext_noop (String)
+# else
# define N_(String) (String)
+# endif
# endif
+#else
+/* Stubs that do something close enough. */
+# define _(String) (String)
+# define N_(String) (String)
#endif
#ifdef __cplusplus
diff -NurdpB workrave-1.8.4/frontend/gtkmm/src/RemoteControl.cc workrave-1.8.4-patched/frontend/gtkmm/src/RemoteControl.cc
--- workrave-1.8.4/frontend/gtkmm/src/RemoteControl.cc 2007-03-04 13:56:38.000000000 -0500
+++ workrave-1.8.4-patched/frontend/gtkmm/src/RemoteControl.cc 2007-03-15 17:59:43.000000000 -0500
@@ -22,13 +22,12 @@ static const char rcsid[] = "$Id: Remote
#include "debug.hh"
-#include "RemoteControl.hh"
-
#include "GUI.hh"
#include "AppletControl.hh"
#include "GnomeAppletWindow.hh"
#include "Menus.hh"
+#include "RemoteControl.hh"
WR_INIT()
|