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
|
From 2db9e1d1a91ea335bfede19ec513dee69569f60a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmx.de>
Date: Tue, 18 Oct 2011 01:43:30 +0200
Subject: [PATCH] port to libxfce4ui
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Andreas Müller <schnitzeltony@gmx.de>
---
configure.ac | 4 ++--
panel-plugin/Makefile.am | 4 ++--
panel-plugin/cpu.c | 4 ++--
panel-plugin/properties.c | 2 +-
panel-plugin/settings.c | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/configure.ac b/configure.ac
index e20015e..3aa57bb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,8 +27,8 @@ dnl Check for standard header files
AC_HEADER_STDC
dnl configure the panel plugin
-XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.20])
-XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.20])
+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0])
+XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.8.0])
XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.12.0])
dnl translations
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index 595c61f..6340196 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -3,11 +3,11 @@ plugin_PROGRAMS = xfce4-cpugraph-plugin
xfce4_cpugraph_plugin_CFLAGS = \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
- @LIBXFCEGUI4_CFLAGS@ \
+ @LIBXFCE4UI_CFLAGS@ \
@LIBXFCE4PANEL_CFLAGS@
xfce4_cpugraph_plugin_LDADD = \
- @LIBXFCEGUI4_LIBS@ \
+ @LIBXFCE4UI_LIBS@ \
@LIBXFCE4PANEL_LIBS@
xfce4_cpugraph_plugin_SOURCES = \
diff --git a/panel-plugin/cpu.c b/panel-plugin/cpu.c
index 63431f6..1f13b51 100644
--- a/panel-plugin/cpu.c
+++ b/panel-plugin/cpu.c
@@ -26,7 +26,7 @@
#include "mode.h"
#include "properties.h"
-#include <libxfcegui4/libxfcegui4.h>
+#include <libxfce4ui/libxfce4ui.h>
#include <libxfce4panel/xfce-hvbox.h>
#ifndef _
# include <libintl.h>
@@ -344,7 +344,7 @@ static gboolean command_cb( GtkWidget *w,GdkEventButton *event, CPUGraph *base )
{
if( event->button == 1 && base->command )
{
- xfce_exec( base->command, base->in_terminal, base->startup_notification, NULL );
+ xfce_spawn_command_line_on_screen( gdk_screen_get_default(), base->command, base->in_terminal, base->startup_notification, NULL );
}
return FALSE;
}
diff --git a/panel-plugin/properties.c b/panel-plugin/properties.c
index 411fafd..ed191dd 100644
--- a/panel-plugin/properties.c
+++ b/panel-plugin/properties.c
@@ -26,7 +26,7 @@
#include "settings.h"
#include <glib/gprintf.h>
-#include <libxfcegui4/libxfcegui4.h>
+#include <libxfce4ui/libxfce4ui.h>
#ifndef _
# include <libintl.h>
diff --git a/panel-plugin/settings.c b/panel-plugin/settings.c
index dcc474e..c0f1fed 100644
--- a/panel-plugin/settings.c
+++ b/panel-plugin/settings.c
@@ -22,7 +22,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "settings.h"
-#include <libxfcegui4/libxfcegui4.h>
+#include <libxfce4ui/libxfce4ui.h>
static void default_command( const gchar ** command, gboolean * in_terminal, gboolean * startup_notification )
{
--
1.7.4.4
|
