Updating branch refs/heads/master
to 358b2728a46bb556f0c5700aea50aaa027cc7ff3 (commit)
from e2a14728d605dda7df21ee439d9efdd3fcfd7b51 (commit)
commit 358b2728a46bb556f0c5700aea50aaa027cc7ff3
Author: Peter de Ridder <pe...@xfce.org>
Date: Sun Apr 7 23:30:40 2013 +0200
Made libxfce4panel more in sync with gtk3 branch.
libxfce4panel/libxfce4panel.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libxfce4panel/libxfce4panel.h b/libxfce4panel/libxfce4panel.h
index 5db33c3..f6b4b22 100644
--- a/libxfce4panel/libxfce4panel.h
+++ b/libxfce4panel/libxfce4panel.h
@@ -19,7 +19,7 @@
#ifndef __LIBXFCE4PANEL__
#define __LIBXFCE4PANEL__
-G_BEGIN_DECLS
+#include <gtk/gtk.h>
#define LIBXFCE4PANEL_INSIDE_LIBXFCE4PANEL_H
@@ -29,13 +29,13 @@ G_BEGIN_DECLS
#include <libxfce4panel/xfce-panel-macros.h>
#include <libxfce4panel/xfce-panel-macros-46.h>
#include <libxfce4panel/xfce-arrow-button.h>
+#if !GTK_CHECK_VERSION (3, 0, 0)
#include <libxfce4panel/xfce-hvbox.h>
+#endif
#include <libxfce4panel/xfce-panel-convenience.h>
#include <libxfce4panel/xfce-panel-plugin.h>
#include <libxfce4panel/xfce-panel-image.h>
#undef LIBXFCE4PANEL_INSIDE_LIBXFCE4PANEL_H
-G_END_DECLS
-
#endif /* !__LIBXFCE4PANEL__ */
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
