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
|
From 57e2a3787261ccc33f47d4d4061148d720d88d7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Thu, 26 Jan 2012 00:45:31 +0100
Subject: [PATCH] port to libxfce4ui
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream status: pending https://bugzilla.xfce.org/show_bug.cgi?id=8406
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
configure.ac | 4 ++--
panel-plugin/Makefile.am | 4 ++--
panel-plugin/cmdspawn.c | 2 +-
panel-plugin/config_gui.c | 2 +-
panel-plugin/config_gui.h | 1 -
panel-plugin/main.c | 17 ++++++-----------
6 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/configure.ac b/configure.ac
index b9d5bd3..a04d0ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,8 +31,8 @@ dnl Check for standard header files
AC_HEADER_STDC
dnl configure the panel plugin
-XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.22])
-XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.2.0])
+XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.8.0])
+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0])
dnl Translations
XDT_I18N([@LINGUAS@])
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index 861a466..f819ff6 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -4,11 +4,11 @@ plugin_PROGRAMS = xfce4-genmon-plugin
xfce4_genmon_plugin_CFLAGS = \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
@LIBXFCE4PANEL_CFLAGS@ \
- @LIBXFCEGUI4_CFLAGS@
+ @LIBXFCE4UI_CFLAGS@
xfce4_genmon_plugin_LDADD = \
@LIBXFCE4PANEL_LIBS@ \
- @LIBXFCEGUI4_LIBS@
+ @LIBXFCE4UI_LIBS@
xfce4_genmon_plugin_SOURCES = \
main.c \
diff --git a/panel-plugin/cmdspawn.c b/panel-plugin/cmdspawn.c
index aef7689..ae9de82 100644
--- a/panel-plugin/cmdspawn.c
+++ b/panel-plugin/cmdspawn.c
@@ -49,7 +49,7 @@
#include <stdarg.h>
#include <errno.h>
#include <sys/wait.h>
-#include <libxfcegui4/libxfcegui4.h>
+#include <libxfce4ui/libxfce4ui.h>
/**********************************************************************/
diff --git a/panel-plugin/config_gui.c b/panel-plugin/config_gui.c
index 49ef267..3550c35 100644
--- a/panel-plugin/config_gui.c
+++ b/panel-plugin/config_gui.c
@@ -28,7 +28,7 @@
#include <gtk/gtk.h>
#include <libxfce4util/libxfce4util.h>
-#include <libxfcegui4/dialogs.h>
+#include <libxfce4ui/libxfce4ui.h>
#include <libxfce4panel/xfce-panel-plugin.h>
diff --git a/panel-plugin/config_gui.h b/panel-plugin/config_gui.h
index 84024b2..c6bb672 100644
--- a/panel-plugin/config_gui.h
+++ b/panel-plugin/config_gui.h
@@ -29,7 +29,6 @@
#include <gtk/gtk.h>
#include <libxfce4util/libxfce4util.h>
-#include <libxfcegui4/dialogs.h>
#include <libxfce4panel/xfce-panel-plugin.h>
diff --git a/panel-plugin/main.c b/panel-plugin/main.c
index 1f741ee..14cf778 100644
--- a/panel-plugin/main.c
+++ b/panel-plugin/main.c
@@ -31,8 +31,7 @@
#include <gtk/gtk.h>
#include <libxfce4util/libxfce4util.h>
-#include <libxfcegui4/dialogs.h>
-#include <libxfcegui4/xfce-exec.h>
+#include <libxfce4ui/libxfce4ui.h>
#include <libxfce4panel/xfce-panel-plugin.h>
#include <libxfce4panel/xfce-panel-convenience.h>
@@ -98,7 +97,7 @@ static void ExecOnClickCmd (Widget_t p_wSc, void *p_pvPlugin)
struct monitor_t *poMonitor = &(poPlugin->oMonitor);
GError *error = NULL;
- xfce_exec(poMonitor->onClickCmd, 0, 0, &error);
+ xfce_spawn_command_line_on_screen( gdk_screen_get_default(), poMonitor->onClickCmd, 0, 0, &error );
if (error) {
char first[256];
g_snprintf (first, sizeof(first), _("Could not run \"%s\""), poMonitor->onClickCmd);
@@ -592,7 +591,8 @@ static void UpdateConf (void *p_pvPlugin)
static void About (Widget_t w, void *unused)
/* Called back when the About button in clicked */
{
- xfce_info (_("%s %s - Generic Monitor\n"
+ xfce_dialog_show_info (NULL, NULL,
+ _("%s %s - Generic Monitor\n"
"Cyclically spawns a script/program, captures its output "
"and displays the resulting string in the panel\n\n"
"(c) 2004 Roger Seguin <roger_seguin@msn.com>\n"
@@ -646,7 +646,7 @@ static void genmon_create_options (XfcePanelPlugin *plugin,
/* Plugin API */
/* Create/pop up the configuration/options GUI */
{
- GtkWidget *dlg, *header, *vbox;
+ GtkWidget *dlg, *vbox;
struct param_t *poConf = &(poPlugin->oConf.oParam);
struct gui_t *poGUI = &(poPlugin->oConf.oGUI);
const char *pcFont = poConf->acFont;
@@ -667,12 +667,7 @@ static void genmon_create_options (XfcePanelPlugin *plugin,
gtk_container_set_border_width (GTK_CONTAINER (dlg), 2);
- header = xfce_create_header (NULL, _("Generic Monitor"));
- gtk_widget_set_size_request (GTK_BIN (header)->child, -1, 32);
- gtk_container_set_border_width (GTK_CONTAINER (header), BORDER - 2);
- gtk_widget_show (header);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), header,
- FALSE, TRUE, 0);
+ xfce_titled_dialog_set_subtitle (XFCE_TITLED_DIALOG (dlg), _("Generic Monitor"));
vbox = gtk_vbox_new(FALSE, BORDER);
gtk_container_set_border_width (GTK_CONTAINER (vbox), BORDER - 2);
--
1.7.4.4
|
