prefixing for the Popup->ObPopup struct

[chaz/openbox] / openbox / popup.h

diff --git a/openbox/popup.h b/openbox/popup.h
index f8aedad402d989f6f918c8acbc34ba4ec44df53c..7a138bd0ebe2413608af22b07503042a6890307c 100644 (file)
--- a/openbox/popup.h
+++ b/openbox/popup.h
@@ -1,9 +1,11 @@
 #ifndef __popup_h
 #define __popup_h
 
-#include "frame.h"
+#include "client.h"
 
-typedef struct Popup Popup;
+#include <glib.h>
+
+typedef struct _ObPopup Popup;
 
 Popup *popup_new(gboolean hasicon);
 void popup_free(Popup *self);
@@ -13,13 +15,13 @@ void popup_free(Popup *self);
   specifies which corner of the popup will be placed at the given coords.
   Static and Forget gravity are equivilent to NorthWest.
 */
-void popup_position(Popup *self, int gravity, int x, int y);
+void popup_position(Popup *self, gint gravity, gint x, gint y);
 /*! Set the sizes for the popup. When set to 0, the size will be based on
   the text size. */
-void popup_size(Popup *self, int w, int h);
-void popup_size_to_string(Popup *self, char *text);
+void popup_size(Popup *self, gint w, gint h);
+void popup_size_to_string(Popup *self, gchar *text);
 
-void popup_show(Popup *self, char *text, ObClientIcon *icon);
+void popup_show(Popup *self, gchar *text, ObClientIcon *icon);
 void popup_hide(Popup *self);
 
 #endif