[Xfce4-commits] <libxfcegui4:master> Deprecated all functions and objects in libxfcegui4.
Nick Schermer
noreply at xfce.org
Sun Oct 31 15:52:02 CET 2010
Updating branch refs/heads/master
to 00e41afbcc1f5170a808ebab64558dc3c39d7216 (commit)
from de23ac875814c3a990f81ec59767b577be3eb4fd (commit)
commit 00e41afbcc1f5170a808ebab64558dc3c39d7216
Author: Nick Schermer <nick at xfce.org>
Date: Sun Oct 31 15:42:43 2010 +0100
Deprecated all functions and objects in libxfcegui4.
libxfcegui4/dialogs.h | 6 ++++--
libxfcegui4/gtk_style.h | 4 ++++
libxfcegui4/gtktoxevent.h | 8 ++++----
libxfcegui4/icons.h | 17 +++++++++--------
libxfcegui4/netk-application.h | 5 +++++
libxfcegui4/netk-class-group.h | 5 +++++
libxfcegui4/netk-pager.h | 5 +++++
libxfcegui4/netk-screen.h | 5 +++++
libxfcegui4/netk-tasklist.h | 5 +++++
libxfcegui4/netk-trayicon.h | 7 ++++---
libxfcegui4/netk-util.h | 5 +++++
libxfcegui4/netk-window-action-menu.h | 4 ++++
libxfcegui4/netk-window-menu.h | 5 +++++
libxfcegui4/netk-window.h | 5 +++++
libxfcegui4/netk-workspace.h | 5 +++++
libxfcegui4/preview_filesel.h | 7 ++++---
libxfcegui4/session-client.h | 5 +++++
libxfcegui4/xfce-appmenuitem.h | 8 +++++---
libxfcegui4/xfce-colorbutton.h | 8 ++++----
libxfcegui4/xfce-exec.h | 4 ++++
libxfcegui4/xfce-filechooser.h | 8 ++++----
libxfcegui4/xfce-gdk-extensions.h | 4 ++++
libxfcegui4/xfce-gtk-extensions.h | 4 ++++
libxfcegui4/xfce-heading.h | 4 ++++
libxfcegui4/xfce-icontheme.h | 7 ++++---
libxfcegui4/xfce-startup-notification.h | 4 ++++
libxfcegui4/xfce-widget-helpers.h | 4 ++++
libxfcegui4/xfce_aboutdialog.h | 4 ++++
libxfcegui4/xfce_clock.h | 8 ++++----
libxfcegui4/xfce_decorbutton.h | 8 ++++----
libxfcegui4/xfce_decortoggle.h | 7 +++----
libxfcegui4/xfce_framebox.h | 7 ++++---
libxfcegui4/xfce_iconbutton.h | 4 ++++
libxfcegui4/xfce_menubutton.h | 4 ++++
libxfcegui4/xfce_movehandler.h | 4 ++++
libxfcegui4/xfce_scaled_image.h | 4 ++++
libxfcegui4/xfce_systemtray.h | 7 ++++---
libxfcegui4/xfce_togglebutton.h | 5 ++++-
libxfcegui4/xinerama.h | 14 +++++++-------
39 files changed, 174 insertions(+), 60 deletions(-)
diff --git a/libxfcegui4/dialogs.h b/libxfcegui4/dialogs.h
index eda5a03..8c71d56 100644
--- a/libxfcegui4/dialogs.h
+++ b/libxfcegui4/dialogs.h
@@ -21,6 +21,8 @@
#ifndef _LIBXFCEGUI4_DIALOGS_H
#define _LIBXFCEGUI4_DIALOGS_H
+#if defined(LIBXFCEGUI4_COMPILATION) || !defined(XFCE_DISABLE_DEPRECATED)
+
#include <stdarg.h>
#include <glib.h>
@@ -32,7 +34,6 @@ G_BEGIN_DECLS
/* new wrappers aroung gtk_message_dialog */
-#if defined(LIBXFCEGUI4_COMPILATION) || !defined(XFCE_DISABLE_DEPRECATED)
/* compat stubs, to be removed someday! */
void show_info (const char *text);
void show_warning (const char *text);
@@ -44,7 +45,6 @@ GtkWidget *small_label (const char *text);
GtkWidget *mixed_button_new (const char *stock, const char *text);
gboolean exec_command (gchar * command);
gboolean exec_command_full_with_envp (gchar ** argv, gchar ** envp);
-#endif
#define XFCE_CUSTOM_PIXBUF_BUTTON "custom-button-pixbuf"
#define XFCE_CUSTOM_STOCK_BUTTON "custom-button-stock"
@@ -88,4 +88,6 @@ GtkWidget *xfce_create_mixed_button (const gchar *stock,
G_END_DECLS
+#endif /* !XFCE_DISABLE_DEPRECATED */
+
#endif /* _LIBXFCEGUI4_DIALOGS_H */
diff --git a/libxfcegui4/gtk_style.h b/libxfcegui4/gtk_style.h
index 0f52e86..dc2d13c 100644
--- a/libxfcegui4/gtk_style.h
+++ b/libxfcegui4/gtk_style.h
@@ -20,6 +20,8 @@
#ifndef __GTKSTYLE_H__
#define __GTKSTYLE_H__
+#if defined(LIBXFCEGUI4_COMPILATION) || !defined(XFCE_DISABLE_DEPRECATED)
+
#include <glib.h>
#include <gtk/gtk.h>
#include <pango/pango-font.h>
@@ -33,4 +35,6 @@ PangoContext *pango_get_context (GtkWidget *widget);
G_END_DECLS
+#endif /* !XFCE_DISABLE_DEPRECATED */
+
#endif
diff --git a/libxfcegui4/gtktoxevent.h b/libxfcegui4/gtktoxevent.h
index decfe42..11916cb 100644
--- a/libxfcegui4/gtktoxevent.h
+++ b/libxfcegui4/gtktoxevent.h
@@ -20,6 +20,8 @@
#ifndef __GTKTOXEVENT_H__
#define __GTKTOXEVENT_H__
+#if defined(LIBXFCEGUI4_COMPILATION) || !defined(XFCE_DISABLE_DEPRECATED)
+
#include <gtk/gtk.h>
#include <gdk/gdk.h>
#include <X11/Xlib.h>
@@ -58,8 +60,6 @@ GdkWindow * xfce_add_event_win (GdkScreen *gscr,
XfceFilterSetup * xfce_init_event_filter (gpointer data);
void xfce_close_event_filter (XfceFilterSetup *setup);
-#if defined(LIBXFCEGUI4_COMPILATION) || !defined(XFCE_DISABLE_DEPRECATED)
-
#define GtkToXEventFilterStatus XfceFilterStatus
#define GtkToXEventFilterStack XfceFilterStack
@@ -78,8 +78,8 @@ Window getDefaultXWindow (void);
GdkWindow *getGdkEventWindow (void);
GdkWindow *getDefaultGdkWindow (void);
-#endif /* XFCE_DISABLE_DEPRECATED */
-
G_END_DECLS
+#endif /* XFCE_DISABLE_DEPRECATED */
+
#endif /* __GTKTOXEVENT_H__ */
diff --git a/libxfcegui4/icons.h b/libxfcegui4/icons.h
index cc71bdd..c5735a2 100644
--- a/libxfcegui4/icons.h
+++ b/libxfcegui4/icons.h
@@ -19,6 +19,8 @@
#ifndef _LIBXFCEGUI4_ICONS_H
#define _LIBXFCEGUI4_ICONS_H
+#if defined(LIBXFCEGUI4_COMPILATION) || !defined(XFCE_DISABLE_DEPRECATED)
+
#include <gtk/gtk.h>
#include <gdk/gdk.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
@@ -79,21 +81,20 @@ gchar *xfce_themed_icon_lookup_category (XfceIconThemeCategory category,
GdkPixbuf *xfce_themed_icon_load_category (XfceIconThemeCategory category,
gint size);
-
-#if defined(LIBXFCEGUI4_COMPILATION) || !defined(XFCE_DISABLE_DEPRECATED)
-void xfce_themed_icon_add_search_path(const gchar *path) G_GNUC_DEPRECATED;
-void xfce_set_icon_theme(const gchar *theme_name) G_GNUC_DEPRECATED;
+void xfce_themed_icon_add_search_path(const gchar *path);
+void xfce_set_icon_theme(const gchar *theme_name);
GdkPixbuf *inline_icon_at_size(const guint8 *data,
int width,
- int height) G_GNUC_DEPRECATED;
+ int height);
GdkPixbuf *xfce_load_themed_icon(const gchar *name,
- gint size) G_GNUC_DEPRECATED;
+ gint size);
GdkPixbuf *xfce_pixbuf_new_from_file_at_size(const gchar *filename,
gint width,
gint height,
- GError **error) G_GNUC_DEPRECATED;
-#endif
+ GError **error);
G_END_DECLS
+#endif /* !XFCE_DISABLE_DEPRECATED */
+
#endif /* _LIBXFCEGUI4_ICONS_H */
diff --git a/libxfcegui4/netk-application.h b/libxfcegui4/netk-application.h
index ccde6f4..8d65e1e 100644
--- a/libxfcegui4/netk-application.h
+++ b/libxfcegui4/netk-application.h
@@ -22,6 +22,8 @@
#ifndef NETK_APPLICATION_H
#define NETK_APPLICATION_H
+#if defined(LIBXFCEGUI4_COMPILATION) || !defined(XFCE_DISABLE_DEPRECATED)
+
#include <glib-object.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <libxfcegui4/netk-screen.h>
@@ -79,4 +81,7 @@ netk_application_get_type (void)
gboolean netk_application_get_icon_is_fallback (NetkApplication * app);
G_END_DECLS
+
+#endif /* !XFCE_DISABLE_DEPRECATED */
+
#endif /* NETK_APPLICATION_H */
diff --git a/libxfcegui4/netk-class-group.h b/libxfcegui4/netk-class-group.h
index 44f2dd2..8fa95e6 100644
--- a/libxfcegui4/netk-class-group.h
+++ b/libxfcegui4/netk-class-group.h
@@ -23,6 +23,8 @@
#ifndef NETK_CLASS_GROUP_H
#define NETK_CLASS_GROUP_H
+#if defined(LIBXFCEGUI4_COMPILATION) || !defined(XFCE_DISABLE_DEPRECATED)
+
#include <glib-object.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <libxfcegui4/netk-screen.h>
@@ -70,4 +72,7 @@ void p_netk_class_group_add_window (NetkClassGroup * class_group, NetkWindow * w
void p_netk_class_group_remove_window (NetkClassGroup * class_group, NetkWindow * window);
G_END_DECLS
+
+#endif /* !XFCE_DISABLE_DEPRECATED */
+
#endif
diff --git a/libxfcegui4/netk-pager.h b/libxfcegui4/netk-pager.h
index aec6fe2..ad627ba 100644
--- a/libxfcegui4/netk-pager.h
+++ b/libxfcegui4/netk-pager.h
@@ -22,6 +22,8 @@
#ifndef NETK_PAGER_H
#define NETK_PAGER_H
+#if defined(LIBXFCEGUI4_COMPILATION) || !defined(XFCE_DISABLE_DEPRECATED)
+
#include <gtk/gtk.h>
#include <libxfcegui4/netk-screen.h>
@@ -76,4 +78,7 @@ netk_pager_get_type (void)
GtkShadowType shadow_type);
G_END_DECLS
+
+#endif /* !XFCE_DISABLE_DEPRECATED */
+
#endif /* NETK_PAGER_H */
diff --git a/libxfcegui4/netk-screen.h b/libxfcegui4/netk-screen.h
index 5aa468a..3753f0c 100644
--- a/libxfcegui4/netk-screen.h
+++ b/libxfcegui4/netk-screen.h
@@ -22,6 +22,8 @@
#ifndef NETK_SCREEN_H
#define NETK_SCREEN_H
+#if defined(LIBXFCEGUI4_COMPILATION) || !defined(XFCE_DISABLE_DEPRECATED)
+
#include <glib-object.h>
G_BEGIN_DECLS
@@ -135,4 +137,7 @@ netk_screen_get_type (void)
G_END_DECLS
+
+#endif /* !XFCE_DISABLE_DEPRECATED */
+
#endif /* NETK_SCREEN_H */
diff --git a/libxfcegui4/netk-tasklist.h b/libxfcegui4/netk-tasklist.h
index 8db3fbe..f04fb1c 100644
--- a/libxfcegui4/netk-tasklist.h
+++ b/libxfcegui4/netk-tasklist.h
@@ -22,6 +22,8 @@
#ifndef NETK_TASKLIST_H
#define NETK_TASKLIST_H
+#if defined(LIBXFCEGUI4_COMPILATION) || !defined(XFCE_DISABLE_DEPRECATED)
+
#include <gtk/gtk.h>
#include <libxfcegui4/netk-screen.h>
@@ -108,4 +110,7 @@ netk_tasklist_get_type (void)
GtkReliefStyle netk_tasklist_get_button_relief(NetkTasklist * tasklist);
G_END_DECLS
+
+#endif /* !XFCE_DISABLE_DEPRECATED */
+
#endif /* NETK_TASKLIST_H */
diff --git a/libxfcegui4/netk-trayicon.h b/libxfcegui4/netk-trayicon.h
index d436fd4..7dd63d0 100644
--- a/libxfcegui4/netk-trayicon.h
+++ b/libxfcegui4/netk-trayicon.h
@@ -23,6 +23,8 @@
#ifndef __NETK_TRAY_ICON_H__
#define __NETK_TRAY_ICON_H__
+#if defined(LIBXFCEGUI4_COMPILATION) || !defined(XFCE_DISABLE_DEPRECATED)
+
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/Xmd.h>
@@ -31,8 +33,6 @@
G_BEGIN_DECLS
-#if defined(LIBXFCEGUI4_COMPILATION) || !defined(XFCE_DISABLE_DEPRECATED)
-
#define NETK_TYPE_TRAY_ICON (netk_tray_icon_get_type())
#define NETK_TRAY_ICON(o) (G_TYPE_CHECK_INSTANCE_CAST((o), \
NETK_TYPE_TRAY_ICON, \
@@ -88,7 +88,8 @@ glong netk_tray_icon_message_new (NetkTrayIcon *trayicon, glong id,
const gchar *text);
void netk_tray_icon_message_cancel (NetkTrayIcon *trayicon, glong id);
+G_END_DECLS
+
#endif /* !XFCE_DISABLE_DEPRECATED */
-G_END_DECLS
#endif /* !__NETK_TRAY_ICON_H__ */
diff --git a/libxfcegui4/netk-util.h b/libxfcegui4/netk-util.h
index 2521fd2..47e5022 100644
--- a/libxfcegui4/netk-util.h
+++ b/libxfcegui4/netk-util.h
@@ -22,6 +22,8 @@
#ifndef NETK_UTIL_H
#define NETK_UTIL_H
+#if defined(LIBXFCEGUI4_COMPILATION) || !defined(XFCE_DISABLE_DEPRECATED)
+
#include <gtk/gtk.h>
#include <glib.h>
#include <X11/Xlib.h>
@@ -77,4 +79,7 @@ gboolean netk_get_desktop_margins (Screen * xscreen,
void netk_set_desktop_margins (Window xwindow, DesktopMargins * margins);
G_END_DECLS
+
+#endif /* !XFCE_DISABLE_DEPRECATED */
+
#endif /* NETK_UTIL_H */
diff --git a/libxfcegui4/netk-window-action-menu.h b/libxfcegui4/netk-window-action-menu.h
index 4327ade..416feee 100644
--- a/libxfcegui4/netk-window-action-menu.h
+++ b/libxfcegui4/netk-window-action-menu.h
@@ -22,6 +22,8 @@
#ifndef NETK_WINDOW_ACTION_MENU_H
#define NETK_WINDOW_ACTION_MENU_H
+#if defined(LIBXFCEGUI4_COMPILATION) || !defined(XFCE_DISABLE_DEPRECATED)
+
#include <libxfcegui4/netk-window.h>
#include <gtk/gtk.h>
@@ -31,4 +33,6 @@ GtkWidget* netk_create_window_action_menu (NetkWindow *window);
G_END_DECLS
+#endif /* !XFCE_DISABLE_DEPRECATED */
+
#endif /* NETK_WINDOW_MENU_H */
diff --git a/libxfcegui4/netk-window-menu.h b/libxfcegui4/netk-window-menu.h
index 9897d22..b6b8aff 100644
--- a/libxfcegui4/netk-window-menu.h
+++ b/libxfcegui4/netk-window-menu.h
@@ -22,6 +22,8 @@
#ifndef NETK_WINDOW_MENU_H
#define NETK_WINDOW_MENU_H
+#if defined(LIBXFCEGUI4_COMPILATION) || !defined(XFCE_DISABLE_DEPRECATED)
+
#include <libxfcegui4/netk-window.h>
#include <gtk/gtk.h>
@@ -30,4 +32,7 @@ G_BEGIN_DECLS
GtkWidget *netk_create_window_menu (GList * windows);
G_END_DECLS
+
+#endif /* !XFCE_DISABLE_DEPRECATED */
+
#endif /* NETK_WINDOW_MENU_H */
diff --git a/libxfcegui4/netk-window.h b/libxfcegui4/netk-window.h
index 1986c70..5b15917 100644
--- a/libxfcegui4/netk-window.h
+++ b/libxfcegui4/netk-window.h
@@ -22,6 +22,8 @@
#ifndef NETK_WINDOW_H
#define NETK_WINDOW_H
+#if defined(LIBXFCEGUI4_COMPILATION) || !defined(XFCE_DISABLE_DEPRECATED)
+
#include <glib-object.h>
#include <libxfcegui4/netk-screen.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
@@ -216,4 +218,7 @@ gboolean netk_window_is_in_viewport (NetkWindow * window,
NetkWorkspace * workspace);
G_END_DECLS
+
+#endif /* !XFCE_DISABLE_DEPRECATED */
+
#endif /* NETK_WINDOW_H */
diff --git a/libxfcegui4/netk-workspace.h b/libxfcegui4/netk-workspace.h
index eae94ca..2518071 100644
--- a/libxfcegui4/netk-workspace.h
+++ b/libxfcegui4/netk-workspace.h
@@ -22,6 +22,8 @@
#ifndef NETK_WORKSPACE_H
#define NETK_WORKSPACE_H
+#if defined(LIBXFCEGUI4_COMPILATION) || !defined(XFCE_DISABLE_DEPRECATED)
+
#include <glib-object.h>
#include <libxfcegui4/netk-screen.h>
@@ -66,4 +68,7 @@ netk_workspace_get_type (void)
int netk_workspace_get_viewport_y (NetkWorkspace * space);
gboolean netk_workspace_is_virtual (NetkWorkspace * space);
G_END_DECLS
+
+#endif /* !XFCE_DISABLE_DEPRECATED */
+
#endif /* NETK_WORKSPACE_H */
diff --git a/libxfcegui4/preview_filesel.h b/libxfcegui4/preview_filesel.h
index 6f74fdf..5406e9e 100644
--- a/libxfcegui4/preview_filesel.h
+++ b/libxfcegui4/preview_filesel.h
@@ -22,12 +22,12 @@
#ifndef __PREVIEW_FILESEL_H__
#define __PREVIEW_FILESEL_H__
+#if defined(LIBXFCEGUI4_COMPILATION) || !defined(XFCE_DISABLE_DEPRECATED)
+
#include <gtk/gtkfilesel.h>
G_BEGIN_DECLS
-#if defined(LIBXFCEGUI4_COMPILATION) || !defined(XFCE_DISABLE_DEPRECATED)
-
#define TYPE_PREVIEW_FILE_SELECTION preview_file_selection_get_type ()
#define PREVIEW_FILE_SELECTION(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PREVIEW_FILE_SELECTION, PreviewFileSelection)
#define PREVIEW_FILE_SELECTION_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, TYPE_PREVIEW_FILE_SELECTION, PreviewFileSelectionClass)
@@ -57,7 +57,8 @@ GtkWidget *preview_file_selection_new (const gchar * title,
GdkPixbuf *preview_file_selection_intelligent_scale (GdkPixbuf * pixbuf,
guint scale);
+G_END_DECLS
+
#endif /* !XFCE_DISABLE_DEPRECATED */
-G_END_DECLS
#endif /* __PREVIEW_FILESEL_H__ */
diff --git a/libxfcegui4/session-client.h b/libxfcegui4/session-client.h
index 790cb14..202c3bb 100644
--- a/libxfcegui4/session-client.h
+++ b/libxfcegui4/session-client.h
@@ -20,6 +20,8 @@
#ifndef SESSION_CLIENT_H
#define SESSION_CLIENT_H
+#if defined(LIBXFCEGUI4_COMPILATION) || !defined(XFCE_DISABLE_DEPRECATED)
+
#include <glib.h>
#include <unistd.h>
#include <sys/types.h>
@@ -162,4 +164,7 @@ G_CONST_RETURN gchar* G_CONST_RETURN * client_session_get_resign_command(Session
G_CONST_RETURN gchar* G_CONST_RETURN * client_session_get_restart_command(SessionClient * session_client);
G_CONST_RETURN gchar* G_CONST_RETURN * client_session_get_discard_command(SessionClient * session_client);
G_CONST_RETURN gchar* G_CONST_RETURN * client_session_get_shutdown_command(SessionClient * session_client);
+
+#endif /* !XFCE_DISABLE_DEPRECATED */
+
#endif
diff --git a/libxfcegui4/xfce-appmenuitem.h b/libxfcegui4/xfce-appmenuitem.h
index 9c33c45..a704453 100644
--- a/libxfcegui4/xfce-appmenuitem.h
+++ b/libxfcegui4/xfce-appmenuitem.h
@@ -23,6 +23,8 @@
#ifndef __XFCE_APP_MENU_ITEM_H__
#define __XFCE_APP_MENU_ITEM_H__
+#if defined(LIBXFCEGUI4_COMPILATION) || !defined(XFCE_DISABLE_DEPRECATED)
+
#include <gtk/gtkimagemenuitem.h>
#include <libxfce4util/libxfce4util.h>
@@ -103,10 +105,10 @@ gboolean xfce_app_menu_item_get_startup_notification (XfceAppMenuItem *app_menu
void xfce_app_menu_item_set_icon_theme_name (const gchar *theme_name);
-#if defined(LIBXFCEGUI4_COMPILATION) || !defined(XFCE_DISABLE_DEPRECATED)
-void xfce_app_menu_item_set_icon_size (guint icon_size) G_GNUC_DEPRECATED;
-#endif
+void xfce_app_menu_item_set_icon_size (guint icon_size);
G_END_DECLS
+#endif /* !XFCE_DISABLE_DEPRECATED */
+
#endif /* !def __XFCE_APP_MENU_ITEM_H__ */
diff --git a/libxfcegui4/xfce-colorbutton.h b/libxfcegui4/xfce-colorbutton.h
index 74d4732..7ccd969 100644
--- a/libxfcegui4/xfce-colorbutton.h
+++ b/libxfcegui4/xfce-colorbutton.h
@@ -25,12 +25,12 @@
#ifndef __XFCE_COLOR_BUTTON_H__
#define __XFCE_COLOR_BUTTON_H__
+#if defined(LIBXFCEGUI4_COMPILATION) || !defined(XFCE_DISABLE_DEPRECATED)
+
#include <gtk/gtk.h>
G_BEGIN_DECLS;
-#if defined(LIBXFCEGUI4_COMPILATION) || !defined(XFCE_DISABLE_DEPRECATED)
-
typedef GtkColorButtonClass XfceColorButtonClass;
typedef GtkColorButton XfceColorButton;
@@ -58,8 +58,8 @@ void xfce_color_button_set_title (XfceColorButton *color_button,
G_CONST_RETURN gchar *xfce_color_button_get_title
(XfceColorButton *color_button);
-#endif /* ifndef XFCE_DISABLE_DEPRECATED */
-
G_END_DECLS;
+#endif /* ifndef XFCE_DISABLE_DEPRECATED */
+
#endif /* ifndef __XFCE_COLOR_BUTTON_H__ */
diff --git a/libxfcegui4/xfce-exec.h b/libxfcegui4/xfce-exec.h
index 187c5ae..069006f 100644
--- a/libxfcegui4/xfce-exec.h
+++ b/libxfcegui4/xfce-exec.h
@@ -23,6 +23,8 @@
#ifndef _XFCE_EXEC_H
#define _XFCE_EXEC_H
+#if defined(LIBXFCEGUI4_COMPILATION) || !defined(XFCE_DISABLE_DEPRECATED)
+
#include <glib.h>
G_BEGIN_DECLS
@@ -68,5 +70,7 @@ gboolean xfce_exec_with_envp_on_screen (GdkScreen * screen, const char *cmd,
G_END_DECLS
+#endif /* !XFCE_DISABLE_DEPRECATED */
+
#endif /* _XFCE_EXEC_H */
diff --git a/libxfcegui4/xfce-filechooser.h b/libxfcegui4/xfce-filechooser.h
index 6815e43..71f0316 100644
--- a/libxfcegui4/xfce-filechooser.h
+++ b/libxfcegui4/xfce-filechooser.h
@@ -23,12 +23,12 @@
#ifndef _XFCE_FILE_CHOOSER_H_
#define _XFCE_FILE_CHOOSER_H_
+#if defined(LIBXFCEGUI4_COMPILATION) || !defined(XFCE_DISABLE_DEPRECATED)
+
#include <gtk/gtkdialog.h>
G_BEGIN_DECLS
-#if defined(LIBXFCEGUI4_COMPILATION) || !defined(XFCE_DISABLE_DEPRECATED)
-
#define XFCE_TYPE_FILE_CHOOSER (xfce_file_chooser_get_type())
#define XFCE_FILE_CHOOSER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), XFCE_TYPE_FILE_CHOOSER, XfceFileChooser))
#define XFCE_FILE_CHOOSER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), XFCE_TYPE_FILE_CHOOSER, XfceFileChooserClass))
@@ -143,8 +143,8 @@ void xfce_file_chooser_set_local_only (XfceFileChooser *chooser,
gboolean xfce_file_chooser_get_local_only (XfceFileChooser *chooser);
-#endif /* ifndef XFCE_DISABLE_DEPRECATED */
-
G_END_DECLS
+#endif /* ifndef XFCE_DISABLE_DEPRECATED */
+
#endif /* ifndef _XFCE_FILE_CHOOSER_H_ */
diff --git a/libxfcegui4/xfce-gdk-extensions.h b/libxfcegui4/xfce-gdk-extensions.h
index 7d8a102..f7c044e 100644
--- a/libxfcegui4/xfce-gdk-extensions.h
+++ b/libxfcegui4/xfce-gdk-extensions.h
@@ -22,6 +22,8 @@
#ifndef __XFCE_GDK_EXTENSIONS_H__
#define __XFCE_GDK_EXTENSIONS_H__
+#if defined(LIBXFCEGUI4_COMPILATION) || !defined(XFCE_DISABLE_DEPRECATED)
+
#include <gdk/gdk.h>
G_BEGIN_DECLS;
@@ -63,4 +65,6 @@ gboolean xfce_gdk_spawn_command_line_on_screen (GdkScreen *screen,
G_END_DECLS;
+#endif /* !XFCE_DISABLE_DEPRECATED */
+
#endif /* !__XFCE_GDK_EXTENSIONS_H__ */
diff --git a/libxfcegui4/xfce-gtk-extensions.h b/libxfcegui4/xfce-gtk-extensions.h
index dd104a3..af17795 100644
--- a/libxfcegui4/xfce-gtk-extensions.h
+++ b/libxfcegui4/xfce-gtk-extensions.h
@@ -22,6 +22,8 @@
#ifndef __XFCE_GTK_EXTENSIONS_H__
#define __XFCE_GTK_EXTENSIONS_H__
+#if defined(LIBXFCEGUI4_COMPILATION) || !defined(XFCE_DISABLE_DEPRECATED)
+
#include <gtk/gtk.h>
G_BEGIN_DECLS;
@@ -34,5 +36,7 @@ void xfce_gtk_window_center_on_monitor_with_pointer (GtkWindow *window);
G_END_DECLS;
+#endif /* !XFCE_DISABLE_DEPRECATED */
+
#endif /* !__XFCE_GTK_EXTENSIONS_H__ */
diff --git a/libxfcegui4/xfce-heading.h b/libxfcegui4/xfce-heading.h
index a7df302..bc2380f 100644
--- a/libxfcegui4/xfce-heading.h
+++ b/libxfcegui4/xfce-heading.h
@@ -21,6 +21,8 @@
#ifndef __XFCE_HEADING_H__
#define __XFCE_HEADING_H__
+#if defined(LIBXFCEGUI4_COMPILATION) || !defined(XFCE_DISABLE_DEPRECATED)
+
#include <gtk/gtk.h>
G_BEGIN_DECLS;
@@ -79,4 +81,6 @@ void xfce_heading_set_title (XfceHeading *heading,
G_END_DECLS;
+#endif /* !XFCE_DISABLE_DEPRECATED */
+
#endif /* !__XFCE_HEADING_H__ */
diff --git a/libxfcegui4/xfce-icontheme.h b/libxfcegui4/xfce-icontheme.h
index 2561b68..2a5a309 100644
--- a/libxfcegui4/xfce-icontheme.h
+++ b/libxfcegui4/xfce-icontheme.h
@@ -22,6 +22,8 @@
#ifndef _XFCE_ICONTHEME_H_
#define _XFCE_ICONTHEME_H_
+#if defined(LIBXFCEGUI4_COMPILATION) || !defined(XFCE_DISABLE_DEPRECATED)
+
#include <glib-object.h>
#include <gdk/gdkscreen.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
@@ -30,8 +32,6 @@
G_BEGIN_DECLS
-#if defined(LIBXFCEGUI4_COMPILATION) || !defined(XFCE_DISABLE_DEPRECATED)
-
#define XFCE_TYPE_ICON_THEME (xfce_icon_theme_get_type())
#define XFCE_ICON_THEME(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), XFCE_TYPE_ICON_THEME, XfceIconTheme))
#define XFCE_IS_ICON_THEME(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), XFCE_TYPE_ICON_THEME))
@@ -103,8 +103,9 @@ void xfce_icon_theme_set_use_svg (XfceIconTheme *icon_theme,
gboolean use_svg) G_GNUC_DEPRECATED;
gboolean xfce_icon_theme_get_use_svg (XfceIconTheme *icon_theme) G_GNUC_DEPRECATED;
-#endif /* !defined(XFCE_DISABLE_DEPRECATED) */
G_END_DECLS
+#endif /* !defined(XFCE_DISABLE_DEPRECATED) */
+
#endif
diff --git a/libxfcegui4/xfce-startup-notification.h b/libxfcegui4/xfce-startup-notification.h
index d66583b..fdafb6b 100644
--- a/libxfcegui4/xfce-startup-notification.h
+++ b/libxfcegui4/xfce-startup-notification.h
@@ -1,6 +1,8 @@
#ifndef __XFCE_STARTUP_NOTIFICATION_H
#define __XFCE_STARTUP_NOTIFICATION_H
+#if defined(LIBXFCEGUI4_COMPILATION) || !defined(XFCE_DISABLE_DEPRECATED)
+
/* not thread safe */
/* returns: id */
@@ -13,4 +15,6 @@ void xfce_startup_notification_cancel(const char* id);
char** xfce_startup_notification_modify_environment(const char** envp, const char* id);
char** xfce_startup_notification_cleanup_environment(const char** envp);
+#endif /* !XFCE_DISABLE_DEPRECATED */
+
#endif
diff --git a/libxfcegui4/xfce-widget-helpers.h b/libxfcegui4/xfce-widget-helpers.h
index 0881340..44a6e2f 100644
--- a/libxfcegui4/xfce-widget-helpers.h
+++ b/libxfcegui4/xfce-widget-helpers.h
@@ -20,6 +20,8 @@
#ifndef __XFCE_DIALOG_HELPERS__H__
#define __XFCE_DIALOG_HELPERS__H__
+#if defined(LIBXFCEGUI4_COMPILATION) || !defined(XFCE_DISABLE_DEPRECATED)
+
#include <gtk/gtk.h>
G_BEGIN_DECLS
@@ -32,4 +34,6 @@ GtkWidget *xfce_create_framebox_with_content (const gchar *title,
G_END_DECLS
+#endif /* !XFCE_DISABLE_DEPRECATED */
+
#endif /* __XFCE_DIALOG_HELPERS__H__ */
diff --git a/libxfcegui4/xfce_aboutdialog.h b/libxfcegui4/xfce_aboutdialog.h
index 23b800a..5828861 100644
--- a/libxfcegui4/xfce_aboutdialog.h
+++ b/libxfcegui4/xfce_aboutdialog.h
@@ -22,6 +22,8 @@
#ifndef __LIBXFCEGUI4_XFCE_ABOUTDIALOG_H__
#define __LIBXFCEGUI4_XFCE_ABOUTDIALOG_H__
+#if defined(LIBXFCEGUI4_COMPILATION) || !defined(XFCE_DISABLE_DEPRECATED)
+
#include <gtk/gtk.h>
#include <libxfce4util/libxfce4util.h>
@@ -133,4 +135,6 @@ GdkPixbuf *xfce_about_dialog_get_icon(XfceAboutDialog* dialog);
G_END_DECLS;
+#endif /* !XFCE_DISABLE_DEPRECATED */
+
#endif /* !__LIBXFCEGUI4_XFCE_ABOUTDIALOG_H__ */
diff --git a/libxfcegui4/xfce_clock.h b/libxfcegui4/xfce_clock.h
index d33e100..9279d80 100644
--- a/libxfcegui4/xfce_clock.h
+++ b/libxfcegui4/xfce_clock.h
@@ -23,13 +23,13 @@
#ifndef __XFCE_CLOCK_H__
#define __XFCE_CLOCK_H__
+#if defined(LIBXFCEGUI4_COMPILATION) || !defined(XFCE_DISABLE_DEPRECATED)
+
#include <gdk/gdk.h>
#include <gtk/gtkwidget.h>
G_BEGIN_DECLS
-#if defined(LIBXFCEGUI4_COMPILATION) || !defined(XFCE_DISABLE_DEPRECATED)
-
#define XFCE_TYPE_CLOCK (xfce_clock_get_type ())
#define XFCE_CLOCK(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, xfce_clock_get_type (), XfceClock)
#define XFCE_CLOCK_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, xfce_clock_get_type (), XfceClockClass)
@@ -121,8 +121,8 @@ G_BEGIN_DECLS
gboolean xfce_clock_get_formatted_view (XfceClock * xfclock);
XfceClockMode xfce_clock_get_mode (XfceClock * xfclock);
-#endif /* !XFCE_DISABLE_DEPRECATED */
-
G_END_DECLS
+#endif /* !XFCE_DISABLE_DEPRECATED */
+
#endif /* __XFCE_CLOCK_H__ */
diff --git a/libxfcegui4/xfce_decorbutton.h b/libxfcegui4/xfce_decorbutton.h
index f3bb3dd..ae41881 100644
--- a/libxfcegui4/xfce_decorbutton.h
+++ b/libxfcegui4/xfce_decorbutton.h
@@ -20,13 +20,13 @@
#ifndef __XFCE_DECORBUTTON_H__
#define __XFCE_DECORBUTTON_H__
+#if defined(LIBXFCEGUI4_COMPILATION) || !defined(XFCE_DISABLE_DEPRECATED)
+
#include <gdk/gdk.h>
#include <gtk/gtkmisc.h>
G_BEGIN_DECLS
-#if defined(LIBXFCEGUI4_COMPILATION) || !defined(XFCE_DISABLE_DEPRECATED)
-
#define XFCE_TYPE_DECORBUTTON (xfce_decorbutton_get_type ())
#define XFCE_DECORBUTTON(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, xfce_decorbutton_get_type (), XfceDecorbutton)
#define XFCE_DECORBUTTON_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, xfce_decorbutton_get_type (), XfceDecorbuttonClass)
@@ -67,8 +67,8 @@ G_BEGIN_DECLS
GtkType xfce_decorbutton_get_type (void);
GtkWidget *xfce_decorbutton_new (XfceDecorbuttonType type);
-#endif /* !XFCE_DISABLE_DEPRECATED */
-
G_END_DECLS
+#endif /* !XFCE_DISABLE_DEPRECATED */
+
#endif /* __XFCE_DECORBUTTON_H__ */
diff --git a/libxfcegui4/xfce_decortoggle.h b/libxfcegui4/xfce_decortoggle.h
index bfe8034..fe1324b 100644
--- a/libxfcegui4/xfce_decortoggle.h
+++ b/libxfcegui4/xfce_decortoggle.h
@@ -20,6 +20,8 @@
#ifndef __XFCE_DECORTOGGLE_H__
#define __XFCE_DECORTOGGLE_H__
+#if defined(LIBXFCEGUI4_COMPILATION) || !defined(XFCE_DISABLE_DEPRECATED)
+
#include <gdk/gdk.h>
#include <gtk/gtkmisc.h>
@@ -66,8 +68,6 @@ G_BEGIN_DECLS
GtkMiscClass parent_class;
};
-#if defined(LIBXFCEGUI4_COMPILATION) || !defined(XFCE_DISABLE_DEPRECATED)
-
GtkType xfce_decortoggle_get_type (void);
GtkWidget *xfce_decortoggle_new (GtkArrowType arrow_type);
void xfce_decortoggle_toggled (XfceDecortoggle * decortoggle);
@@ -78,9 +78,8 @@ G_BEGIN_DECLS
GtkArrowType xfce_decortoggle_get_arrow_type (XfceDecortoggle *
decortoggle);
-#endif
-
G_END_DECLS
+#endif /* !XFCE_DISABLE_DEPRECATED */
#endif /* __XFCE_DECORTOGGLE_H__ */
diff --git a/libxfcegui4/xfce_framebox.h b/libxfcegui4/xfce_framebox.h
index b54e841..7fa8c4b 100644
--- a/libxfcegui4/xfce_framebox.h
+++ b/libxfcegui4/xfce_framebox.h
@@ -20,13 +20,13 @@
#ifndef __XFCE_FRAMEBOX_H__
#define __XFCE_FRAMEBOX_H__
+#if defined(LIBXFCEGUI4_COMPILATION) || !defined(XFCE_DISABLE_DEPRECATED)
+
#include <gdk/gdk.h>
#include <gtk/gtkframe.h>
G_BEGIN_DECLS
-#if defined(LIBXFCEGUI4_COMPILATION) || !defined(XFCE_DISABLE_DEPRECATED)
-
#define XFCE_TYPE_FRAMEBOX (xfce_framebox_get_type())
#define XFCE_FRAMEBOX(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, xfce_framebox_get_type (), XfceFramebox)
#define XFCE_FRAMEBOX_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, xfce_framebox_get_type (), XfceFrameboxClass)
@@ -53,8 +53,9 @@ G_BEGIN_DECLS
void xfce_framebox_add (XfceFramebox *framebox,
GtkWidget *widget);
-#endif /* !XFCE_DISABLE_DEPRECATED */
G_END_DECLS
+#endif /* !XFCE_DISABLE_DEPRECATED */
+
#endif /* __XFCE_FRAMEBOX_H__ */
diff --git a/libxfcegui4/xfce_iconbutton.h b/libxfcegui4/xfce_iconbutton.h
index e58ba13..692a0b5 100644
--- a/libxfcegui4/xfce_iconbutton.h
+++ b/libxfcegui4/xfce_iconbutton.h
@@ -20,6 +20,8 @@
#ifndef __XFCE_ICONBUTTON_H__
#define __XFCE_ICONBUTTON_H__
+#if defined(LIBXFCEGUI4_COMPILATION) || !defined(XFCE_DISABLE_DEPRECATED)
+
#include <gdk/gdk.h>
#include <gtk/gtkbutton.h>
#include <gtk/gtkenums.h>
@@ -61,6 +63,8 @@ G_BEGIN_DECLS
G_END_DECLS
+#endif /* !XFCE_DISABLE_DEPRECATED */
+
#endif /* __XFCE_ICONBUTTON_H__ */
/* example-end */
diff --git a/libxfcegui4/xfce_menubutton.h b/libxfcegui4/xfce_menubutton.h
index 7d03504..3c6fd39 100644
--- a/libxfcegui4/xfce_menubutton.h
+++ b/libxfcegui4/xfce_menubutton.h
@@ -20,6 +20,8 @@
#ifndef __XFCE_MENUBUTTON_H__
#define __XFCE_MENUBUTTON_H__
+#if defined(LIBXFCEGUI4_COMPILATION) || !defined(XFCE_DISABLE_DEPRECATED)
+
#include <gdk/gdk.h>
#include <gtk/gtkbutton.h>
#include <gtk/gtkenums.h>
@@ -75,6 +77,8 @@ G_BEGIN_DECLS
G_END_DECLS
+#endif /* !XFCE_DISABLE_DEPRECATED */
+
#endif /* __XFCE_MENUBUTTON_H__ */
/* example-end */
diff --git a/libxfcegui4/xfce_movehandler.h b/libxfcegui4/xfce_movehandler.h
index 69f0072..e4a2127 100644
--- a/libxfcegui4/xfce_movehandler.h
+++ b/libxfcegui4/xfce_movehandler.h
@@ -20,6 +20,8 @@
#ifndef __XFCE_MOVEHANDLER_H__
#define __XFCE_MOVEHANDLER_H__
+#if defined(LIBXFCEGUI4_COMPILATION) || !defined(XFCE_DISABLE_DEPRECATED)
+
#include <gdk/gdk.h>
#include <gtk/gtkwidget.h>
@@ -76,5 +78,7 @@ G_BEGIN_DECLS
G_END_DECLS
+#endif /* !XFCE_DISABLE_DEPRECATED */
+
#endif /* __XFCE_MOVEHANDLER_H__ */
diff --git a/libxfcegui4/xfce_scaled_image.h b/libxfcegui4/xfce_scaled_image.h
index 1a532cd..9dd37dc 100644
--- a/libxfcegui4/xfce_scaled_image.h
+++ b/libxfcegui4/xfce_scaled_image.h
@@ -20,6 +20,8 @@
#ifndef __XFCE_SCALED_IMAGE_H__
#define __XFCE_SCALED_IMAGE_H__
+#if defined(LIBXFCEGUI4_COMPILATION) || !defined(XFCE_DISABLE_DEPRECATED)
+
#include <gtk/gtkimage.h>
G_BEGIN_DECLS
@@ -59,4 +61,6 @@ void xfce_scaled_image_set_from_pixbuf (XfceScaledImage * image,
G_END_DECLS
+#endif /* !XFCE_DISABLE_DEPRECATED */
+
#endif /* __XFCE_SCALED_IMAGE_H__ */
diff --git a/libxfcegui4/xfce_systemtray.h b/libxfcegui4/xfce_systemtray.h
index edf580e..b7a4032 100644
--- a/libxfcegui4/xfce_systemtray.h
+++ b/libxfcegui4/xfce_systemtray.h
@@ -26,6 +26,8 @@
#ifndef __HAVE_XFCE_SYSTEM_TRAY_H__
#define __HAVE_XFCE_SYSTEM_TRAY_H__
+#if defined(LIBXFCEGUI4_COMPILATION) || !defined(XFCE_DISABLE_DEPRECATED)
+
#include <glib.h>
#if defined (GTK_CHECK_VERSION) && GTK_CHECK_VERSION(2,2,0)
#include <gdk/gdkscreen.h>
@@ -38,8 +40,6 @@
G_BEGIN_DECLS
-#if defined(LIBXFCEGUI4_COMPILATION) || !defined(XFCE_DISABLE_DEPRECATED)
-
/*
* Tray icons can send "opcodes" to the system tray. These are X client
* messages, sent with NoEventMask, a message_type of _NET_SYSTEM_TRAY_OPCODE,
@@ -137,7 +137,8 @@ void xfce_system_tray_unregister (XfceSystemTray *tray);
/* check if a system tray is already running for the screen */
gboolean xfce_system_tray_check_running (Screen *screen);
+G_END_DECLS
+
#endif /* !XFCE_DISABLE_DEPRECATED */
-G_END_DECLS
#endif /* !__HAVE_XFCE_SYSTEM_TRAY_H__ */
diff --git a/libxfcegui4/xfce_togglebutton.h b/libxfcegui4/xfce_togglebutton.h
index bc43afb..0cbc19a 100644
--- a/libxfcegui4/xfce_togglebutton.h
+++ b/libxfcegui4/xfce_togglebutton.h
@@ -20,6 +20,8 @@
#ifndef __XFCE_TOGGLEBUTTON_H__
#define __XFCE_TOGGLEBUTTON_H__
+#if defined(LIBXFCEGUI4_COMPILATION) || !defined(XFCE_DISABLE_DEPRECATED)
+
#include <gdk/gdk.h>
#include <gtk/gtktogglebutton.h>
#include <gtk/gtkenums.h>
@@ -66,5 +68,6 @@ G_BEGIN_DECLS
G_END_DECLS
+#endif /* !XFCE_DISABLE_DEPRECATED */
-#endif /* __XFCE_TOGGLEBUTTON_H__ */
+#endif /* __XFCE_TOGGLEBUTTON_H__ */
diff --git a/libxfcegui4/xinerama.h b/libxfcegui4/xinerama.h
index ea554cd..f0e3350 100644
--- a/libxfcegui4/xinerama.h
+++ b/libxfcegui4/xinerama.h
@@ -17,17 +17,17 @@
* Boston, MA 02111-1307, USA.
*/
+#ifndef __XINERAMA_H__
+#define __XINERAMA_H__
+
+#if defined(LIBXFCEGUI4_COMPILATION) || !defined(XFCE_DISABLE_DEPRECATED)
+
#include <glib.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
-#ifndef __XINERAMA_H__
-#define __XINERAMA_H__
-
G_BEGIN_DECLS;
-#if defined(LIBXFCEGUI4_COMPILATION) || !defined(XFCE_DISABLE_DEPRECATED)
-
gboolean xineramaInit (Display * dpy);
void xineramaFree (void);
gint xineramaGetHeads (void);
@@ -44,8 +44,8 @@ gboolean isLeftMostHead (Display * dpy, int screen, gint x, gint y);
gboolean isTopMostHead (Display * dpy, int screen, gint x, gint y);
gboolean isBottomMostHead (Display * dpy, int screen, gint x, gint y);
-#endif /* XFCE_DISABLE_DEPRECATED */
-
G_END_DECLS;
+#endif /* XFCE_DISABLE_DEPRECATED */
+
#endif /* __XINERAMA_H__ */
More information about the Xfce4-commits
mailing list