Author: benny
Date: 2006-09-14 12:45:17 +0000 (Thu, 14 Sep 2006)
New Revision: 23156
Modified:
thunar/trunk/ChangeLog
thunar/trunk/thunarx/thunarx-config.h.in
thunar/trunk/thunarx/thunarx-file-info.h
Log:
2006-09-14 Benedikt Meurer <[EMAIL PROTECTED]>
* thunarx/thunarx-config.h.in, thunarx/thunarx-file-info.h: Fix build
with GLib 2.6.x. Bug #2317.
Modified: thunar/trunk/ChangeLog
===================================================================
--- thunar/trunk/ChangeLog 2006-09-14 12:25:32 UTC (rev 23155)
+++ thunar/trunk/ChangeLog 2006-09-14 12:45:17 UTC (rev 23156)
@@ -1,5 +1,10 @@
2006-09-14 Benedikt Meurer <[EMAIL PROTECTED]>
+ * thunarx/thunarx-config.h.in, thunarx/thunarx-file-info.h: Fix build
+ with GLib 2.6.x. Bug #2317.
+
+2006-09-14 Benedikt Meurer <[EMAIL PROTECTED]>
+
* thunarx/thunarx-menu-provider.{c,h}, thunarx/thunarx.symbols: Add a
new method get_dnd_actions() to the ThunarxMenuProvider, which allows
menu providers to install additional actions into the Drag'n'Drop
Modified: thunar/trunk/thunarx/thunarx-config.h.in
===================================================================
--- thunar/trunk/thunarx/thunarx-config.h.in 2006-09-14 12:25:32 UTC (rev
23155)
+++ thunar/trunk/thunarx/thunarx-config.h.in 2006-09-14 12:45:17 UTC (rev
23156)
@@ -1,6 +1,6 @@
/* $Id$ */
/*-
- * Copyright (c) 2005 Benedikt Meurer <[EMAIL PROTECTED]>
+ * Copyright (c) 2005-2006 Benedikt Meurer <[EMAIL PROTECTED]>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -25,7 +25,7 @@
#ifndef __THUNARX_CONFIG_H__
#define __THUNARX_CONFIG_H__
-#include <glib.h>
+#include <glib-object.h>
G_BEGIN_DECLS;
@@ -49,6 +49,15 @@
guint required_minor,
guint required_micro);
+/* verify that G_GNUC_WARN_UNUSED_RESULT is defined */
+#if !defined(G_GNUC_WARN_UNUSED_RESULT)
+#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
+#define G_GNUC_WARN_UNUSED_RESULT __attribute__((warn_unused_result))
+#else
+#define G_GNUC_WARN_UNUSED_RESULT
+#endif /* __GNUC__ */
+#endif /* !defined(G_GNUC_WARN_UNUSED_RESULT) */
+
G_END_DECLS;
#endif /* !__THUNARX_CONFIG_H__ */
Modified: thunar/trunk/thunarx/thunarx-file-info.h
===================================================================
--- thunar/trunk/thunarx/thunarx-file-info.h 2006-09-14 12:25:32 UTC (rev
23155)
+++ thunar/trunk/thunarx/thunarx-file-info.h 2006-09-14 12:45:17 UTC (rev
23156)
@@ -25,7 +25,7 @@
#ifndef __THUNARX_FILE_INFO_H__
#define __THUNARX_FILE_INFO_H__
-#include <glib-object.h>
+#include <thunarx/thunarx-config.h>
G_BEGIN_DECLS;
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
