Fix some compiler warnings

(Old svn revision: 4000)

21 files changed, 21 insertions, 55 deletions

diff --git a/panel/controls.c b/panel/controls.c
index 09f84187..954441d1 100644
--- a/panel/controls.c
+++ b/panel/controls.c
@@ -44,8 +44,7 @@
 #include <config.h>
 #endif
 
-#include <libxfce4util/i18n.h>
-#include <libxfce4util/debug.h>
+#include <libxfce4util/libxfce4util.h>
 
 #include "xfce.h"
 #include "item.h"
@@ -574,25 +573,6 @@ add_control (GtkWidget * w, ControlClassInfo *info)
 	panel_set_autohide (TRUE);
 }
 
-static GtkItemFactoryEntry control_items[] = {
-    {"/Item", NULL, NULL, 0, "<Branch>"},
-    {N_("/_Properties..."), NULL, edit_control, 0, "<Item>"},
-    {N_("/_Remove"), NULL, remove_control, 0, "<Item>"},
-    {"/sep", NULL, NULL, 0, "<Separator>"},
-    {N_("/Add _new item"), NULL, NULL, 0, "<Branch>"},
-};
-
-static const char *
-translate_menu (const char *msg)
-{
-#if ENABLE_NLS
-    /* ensure we use the panel domain and not that of a plugin */
-    return dgettext (GETTEXT_PACKAGE, msg);
-#else
-    return msg;
-#endif
-}
-
 GtkWidget *
 get_controls_submenu (void)
 {
diff --git a/panel/controls_dialog.c b/panel/controls_dialog.c
index 423fcaa2..4c336cc1 100644
--- a/panel/controls_dialog.c
+++ b/panel/controls_dialog.c
@@ -31,7 +31,7 @@
 #include <config.h>
 #endif
 
-#include <libxfce4util/i18n.h>
+#include <libxfce4util/libxfce4util.h>
 
 #include "xfce.h"
 #include "controls_dialog.h"
diff --git a/panel/groups.c b/panel/groups.c
index b8a9e7db..5d5fba34 100644
--- a/panel/groups.c
+++ b/panel/groups.c
@@ -35,8 +35,7 @@
 #include <config.h>
 #endif
 
-#include <libxfce4util/i18n.h>
-#include <libxfce4util/debug.h>
+#include <libxfce4util/libxfce4util.h>
 
 #include "xfce.h"
 #include "groups.h"
diff --git a/panel/icons.c b/panel/icons.c
index 1fe6136d..f415ab02 100644
--- a/panel/icons.c
+++ b/panel/icons.c
@@ -21,8 +21,7 @@
 #include <config.h>
 #endif
 
-#include <libxfce4util/i18n.h>
-#include <libxfcegui4/icons.h>
+#include <libxfce4util/libxfce4util.h>
 
 #include "xfce.h"
 #include "icons/xfce4-panel-icon.h"
diff --git a/panel/item.c b/panel/item.c
index f11f1fb3..8f06d543 100644
--- a/panel/item.c
+++ b/panel/item.c
@@ -31,7 +31,7 @@
 #include <config.h>
 #endif
 
-#include <libxfce4util/i18n.h>
+#include <libxfce4util/libxfce4util.h>
 #include <libxfcegui4/xfce_togglebutton.h>
 #include <libxfcegui4/xfce_menubutton.h>
 
diff --git a/panel/item_dialog.c b/panel/item_dialog.c
index 134bb694..4edd6c3f 100644
--- a/panel/item_dialog.c
+++ b/panel/item_dialog.c
@@ -37,8 +37,7 @@
 #include <config.h>
 #endif
 
-#include <libxfce4util/debug.h>
-#include <libxfce4util/i18n.h>
+#include <libxfce4util/libxfce4util.h>
 
 #include "xfce.h"
 #include "groups.h"
diff --git a/panel/main.c b/panel/main.c
index 924869c7..6343e9fa 100644
--- a/panel/main.c
+++ b/panel/main.c
@@ -45,8 +45,7 @@
 #include <unistd.h>
 #endif
 
-#include <libxfce4util/i18n.h>
-#include <libxfce4util/debug.h>
+#include <libxfce4util/libxfce4util.h>
 #include <libxfcegui4/session-client.h>
 #include <libxfcegui4/netk-util.h>
 
diff --git a/panel/mcs_client.c b/panel/mcs_client.c
index 8d1b5e06..d3a1a7a3 100644
--- a/panel/mcs_client.c
+++ b/panel/mcs_client.c
@@ -34,8 +34,7 @@
 #include <X11/Xatom.h>
 #include <gdk/gdkx.h>
 
-#include <libxfce4util/i18n.h>
-#include <libxfce4util/debug.h>
+#include <libxfce4util/libxfce4util.h>
 #include <libxfce4mcs/mcs-client.h>
 #include <libxfcegui4/libnetk.h>
 
diff --git a/panel/panel.c b/panel/panel.c
index 30efabb5..b4b2a8e1 100644
--- a/panel/panel.c
+++ b/panel/panel.c
@@ -34,8 +34,7 @@
 
 #include <X11/Xlib.h>
 
-#include <libxfce4util/debug.h>
-#include <libxfce4util/i18n.h>
+#include <libxfce4util/libxfce4util.h>
 #include <libxfcegui4/libnetk.h>
 #include <libxfcegui4/xinerama.h>
 
diff --git a/panel/popup.c b/panel/popup.c
index 24357fa6..447b7bfc 100644
--- a/panel/popup.c
+++ b/panel/popup.c
@@ -27,8 +27,7 @@
 
 #include <gdk/gdkkeysyms.h>
 
-#include <libxfce4util/debug.h>
-#include <libxfce4util/i18n.h>
+#include <libxfce4util/libxfce4util.h>
 #include <libxfcegui4/xfce_togglebutton.h>
 #include <libxfcegui4/xfce_menubutton.h>
 
diff --git a/panel/settings.c b/panel/settings.c
index 1cf3d7a5..0d325aa7 100644
--- a/panel/settings.c
+++ b/panel/settings.c
@@ -33,7 +33,7 @@
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 
-#include <libxfce4util/debug.h>
+#include <libxfce4util/libxfce4util.h>
 
 #include "xfce.h"
 #include "settings.h"
diff --git a/panel/xfce_support.c b/panel/xfce_support.c
index 8d1f0d74..be5cfc81 100644
--- a/panel/xfce_support.c
+++ b/panel/xfce_support.c
@@ -41,8 +41,7 @@
 #include <glib.h>
 #include <gdk/gdk.h>
 
-#include <libxfce4util/i18n.h>
-#include <libxfce4util/util.h>
+#include <libxfce4util/libxfce4util.h>
 #include <libxfcegui4/libxfcegui4.h>
 
 #ifdef HAVE_LIBSTARTUP_NOTIFICATION
diff --git a/panel/xfcombo.c b/panel/xfcombo.c
index 5c7971bb..4604d4be 100644
--- a/panel/xfcombo.c
+++ b/panel/xfcombo.c
@@ -35,9 +35,7 @@
 #include <gmodule.h>
 #include <dbh.h>
 
-#include <libxfce4util/debug.h>
-#include <libxfce4util/i18n.h>
-#include <libxfce4util/util.h>
+#include <libxfce4util/libxfce4util.h>
 
 #define RUN_FLAG_FILE "xffm.runflag.2.dbh"
 #define RUN_DBH_FILE "xffm.runlist.2.dbh"
diff --git a/plugins/clock/clock.c b/plugins/clock/clock.c
index 24593c6d..c124ea7e 100644
--- a/plugins/clock/clock.c
+++ b/plugins/clock/clock.c
@@ -41,7 +41,7 @@
 #include <unistd.h>
 #endif
 
-#include <libxfce4util/i18n.h>
+#include <libxfce4util/libxfce4util.h>
 #include <libxfcegui4/xfce_clock.h>
 
 #include <panel/global.h>
diff --git a/plugins/mailcheck/mailcheck.c b/plugins/mailcheck/mailcheck.c
index c8d7b015..505713b6 100644
--- a/plugins/mailcheck/mailcheck.c
+++ b/plugins/mailcheck/mailcheck.c
@@ -41,8 +41,7 @@
 #include <netdb.h>
 #include <sys/socket.h>
 
-#include <libxfce4util/i18n.h>
-#include <libxfce4util/debug.h>
+#include <libxfce4util/libxfce4util.h>
 #include <libxfcegui4/xfce_iconbutton.h>
 
 #include <panel/xfce.h>
diff --git a/plugins/pager/pager.c b/plugins/pager/pager.c
index 2b1a49a8..748e42fe 100644
--- a/plugins/pager/pager.c
+++ b/plugins/pager/pager.c
@@ -27,7 +27,7 @@
 
 #include <math.h>
 
-#include <libxfce4util/i18n.h>
+#include <libxfce4util/libxfce4util.h>
 #include <libxfcegui4/libxfcegui4.h>
 
 #include <panel/xfce.h>
diff --git a/plugins/separator/separator.c b/plugins/separator/separator.c
index a20d5fc6..6de60e6b 100644
--- a/plugins/separator/separator.c
+++ b/plugins/separator/separator.c
@@ -27,7 +27,7 @@
 #include <config.h>
 #endif
 
-#include <libxfce4util/i18n.h>
+#include <libxfce4util/libxfce4util.h>
 
 #include <panel/plugins.h>
 #include <panel/xfce.h>
diff --git a/plugins/switcher/switcher.c b/plugins/switcher/switcher.c
index fe765c35..23565018 100644
--- a/plugins/switcher/switcher.c
+++ b/plugins/switcher/switcher.c
@@ -24,7 +24,7 @@
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 
-#include <libxfce4util/i18n.h>
+#include <libxfce4util/libxfce4util.h>
 #include <libxfcegui4/libxfcegui4.h>
 
 #include <panel/xfce.h>
diff --git a/plugins/systembuttons/systembuttons.c b/plugins/systembuttons/systembuttons.c
index ae094db4..5bfe0f0c 100644
--- a/plugins/systembuttons/systembuttons.c
+++ b/plugins/systembuttons/systembuttons.c
@@ -27,7 +27,7 @@
 #include <config.h>
 #endif
 
-#include <libxfce4util/i18n.h>
+#include <libxfce4util/libxfce4util.h>
 #include <libxfcegui4/xfce_iconbutton.h>
 
 #include <panel/mcs_client.h>
diff --git a/settings/xfce_settings_dialog.c b/settings/xfce_settings_dialog.c
index 8681fc18..d4e120fe 100644
--- a/settings/xfce_settings_dialog.c
+++ b/settings/xfce_settings_dialog.c
@@ -31,8 +31,7 @@
 
 #include <gtk/gtk.h>
 
-#include <libxfce4util/i18n.h>
-#include <libxfce4util/debug.h>
+#include <libxfce4util/libxfce4util.h>
 #include <libxfce4mcs/mcs-manager.h>
 #include <libxfcegui4/dialogs.h>
 #include <libxfcegui4/xfce_framebox.h>
diff --git a/settings/xfce_settings_plugin.c b/settings/xfce_settings_plugin.c
index bf256288..ce32634c 100644
--- a/settings/xfce_settings_plugin.c
+++ b/settings/xfce_settings_plugin.c
@@ -34,11 +34,9 @@
 #include <gtk/gtk.h>
 #include <X11/Xlib.h>
 
+#include <libxfce4util/libxfce4util.h>
 #include <libxfce4mcs/mcs-common.h>
 #include <libxfce4mcs/mcs-manager.h>
-#include <libxfce4util/i18n.h>
-#include <libxfce4util/util.h>
-#include <libxfce4util/debug.h>
 #include <xfce-mcs-manager/manager-plugin.h>
 #include <libxfcegui4/icons.h>