Merge branch 'backport' into work

[chaz/openbox] / openbox / popup.h

diff --git a/openbox/popup.h b/openbox/popup.h
index 0072f53e1c081f7998333eff01270538c2148e5d..503e27735b3656b956683b7569fb582543429c97 100644 (file)
--- a/openbox/popup.h
+++ b/openbox/popup.h
@@ -77,7 +77,7 @@ struct _ObPagerPopup
     RrAppearance *unhilight;
 };
 
-ObPopup *popup_new();
+ObPopup *popup_new(void);
 void popup_free(ObPopup *self);
 
 /*! Position the popup. The gravity rules are not the same X uses for windows,
@@ -105,12 +105,12 @@ void popup_hide(ObPopup *self);
 RrAppearance *popup_icon_appearance(ObPopup *self);
 
 
-ObIconPopup *icon_popup_new();
+ObIconPopup *icon_popup_new(void);
 void icon_popup_free(ObIconPopup *self);
 
 #define icon_popup_show(s, t, i) icon_popup_delay_show((s),0,(t),(i))
 void icon_popup_delay_show(ObIconPopup *self, gulong usec,
-                           gchar *text, const struct _ObClientIcon *icon);
+                           gchar *text, RrImage *icon);
 #define icon_popup_hide(p) popup_hide((p)->popup)
 #define icon_popup_position(p, g, x, y) popup_position((p)->popup,(g),(x),(y))
 #define icon_popup_text_width(p, w) popup_text_width((p)->popup,(w))
@@ -124,7 +124,7 @@ void icon_popup_delay_show(ObIconPopup *self, gulong usec,
 #define icon_popup_set_text_align(p, j) popup_set_text_align((p)->popup,(j))
 void icon_popup_icon_size_multiplier(ObIconPopup *self, guint wm, guint hm);
 
-ObPagerPopup *pager_popup_new();
+ObPagerPopup *pager_popup_new(void);
 void pager_popup_free(ObPagerPopup *self);
 
 #define pager_popup_show(s, t, d) pager_popup_delay_show((s),0,(t),(d))