[Xfce4-commits] <xfce4-panel:devel> Use glib functions, panel assert are private.

[Nick Schermer]

Updating branch refs/heads/devel
         to 149242c9f0e326a6090f113ba7dafe01936462ad (commit)
       from 0a01c0940f24f38bfeb5ba860719c16ae2c65333 (commit)

commit 149242c9f0e326a6090f113ba7dafe01936462ad
Author: Nick Schermer <nick at xfce.org>
Date:   Sat Nov 21 22:21:37 2009 +0100

    Use glib functions, panel assert are private.

 libxfce4panel/xfce-panel-macros.h |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libxfce4panel/xfce-panel-macros.h b/libxfce4panel/xfce-panel-macros.h
index 58f7d9c..f1ca794 100644
--- a/libxfce4panel/xfce-panel-macros.h
+++ b/libxfce4panel/xfce-panel-macros.h
@@ -166,7 +166,7 @@ typedef GTypeModule XfcePanelTypeModule;
   static void \
   xfce_panel_module_realize (XfcePanelPlugin *xpp) \
   { \
-    panel_return_if_fail (XFCE_IS_PANEL_PLUGIN (xpp)); \
+    g_return_if_fail (XFCE_IS_PANEL_PLUGIN (xpp)); \
     \
     g_signal_handlers_disconnect_by_func (G_OBJECT (xpp), \
         G_CALLBACK (xfce_panel_module_realize), NULL); \
@@ -193,8 +193,8 @@ typedef GTypeModule XfcePanelTypeModule;
   { \
     XfcePanelPlugin *xpp = NULL; \
     \
-    panel_return_val_if_fail (GDK_IS_SCREEN (xpp_screen), NULL); \
-    panel_return_val_if_fail (xpp_name != NULL && xpp_unique_id != -1, NULL); \
+    g_return_val_if_fail (GDK_IS_SCREEN (xpp_screen), NULL); \
+    g_return_val_if_fail (xpp_name != NULL && xpp_unique_id != -1, NULL); \
     \
     CHECK_CODE \
       { \