appcat
/
xfce4-speed-plugin
1
0
Fork 0
Code Issues Pull Requests Wiki Activity

Bug 7083: Port from libxfcegui4 to libxfce4ui

master
Christoph J. Thompson 2012-01-07 15:53:08 +01:00 committed by Mike Massonnet
parent 11313a0907
commit e683d98fea
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac.in
View File

@ -56,7 +56,7 @@ dnl configure the panel plugin
XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.20]) XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.20])
dnl configure the libxfcegui4 dnl configure the libxfcegui4
XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.4.0]) XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.7.0])
dnl Check for i18n support dnl Check for i18n support
XDT_I18N([@LINGUAS@]) XDT_I18N([@LINGUAS@])

4
panel-plugin/Makefile.am
View File

@ -17,12 +17,12 @@ xfce4_netload_plugin_SOURCES = \
xfce4_netload_plugin_CFLAGS = \ xfce4_netload_plugin_CFLAGS = \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
@LIBXFCE4PANEL_CFLAGS@ \ @LIBXFCE4PANEL_CFLAGS@ \
@LIBXFCEGUI4_CFLAGS@ @LIBXFCE4UI_CFLAGS@
xfce4_netload_plugin_LDADD = \ xfce4_netload_plugin_LDADD = \
@SOLLIBS@ \ @SOLLIBS@ \
@LIBXFCE4PANEL_LIBS@ \ @LIBXFCE4PANEL_LIBS@ \
@LIBXFCEGUI4_LIBS@ @LIBXFCE4UI_LIBS@
# .desktop file # .desktop file
# #

5
panel-plugin/netload.c
View File

@ -30,7 +30,7 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <libxfce4util/libxfce4util.h> #include <libxfce4util/libxfce4util.h>
#include <libxfcegui4/libxfcegui4.h> #include <libxfce4ui/libxfce4ui.h>
#include <libxfce4panel/xfce-panel-plugin.h> #include <libxfce4panel/xfce-panel-plugin.h>
@ -527,7 +527,8 @@ static void setup_monitor(t_global_monitor *global, gboolean supress_warnings)
if (!init_netload( &(global->monitor->data), global->monitor->options.network_device) if (!init_netload( &(global->monitor->data), global->monitor->options.network_device)
&& !supress_warnings) && !supress_warnings)
{ {
xfce_err (_("%s: Error in initalizing:\n%s"), xfce_dialog_show_error (NULL, NULL,
_("%s: Error in initalizing:\n%s"),
_(APP_NAME), _(APP_NAME),
_(errormessages[ _(errormessages[
global->monitor->data.errorcode == 0 global->monitor->data.errorcode == 0