aboutsummaryrefslogtreecommitdiffstats
path: root/matchbox/mb-wm-decor.c
diff options
context:
space:
mode:
Diffstat (limited to 'matchbox/mb-wm-decor.c')
-rw-r--r--matchbox/mb-wm-decor.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/matchbox/mb-wm-decor.c b/matchbox/mb-wm-decor.c
index eb3945e..51f674e 100644
--- a/matchbox/mb-wm-decor.c
+++ b/matchbox/mb-wm-decor.c
@@ -39,7 +39,7 @@ static int
mb_wm_decor_init (MBWMObject *obj, va_list vap)
{
MBWMDecor *decor = MB_WM_DECOR (obj);
- MBWindowManager *wm = NULL;
+ MBWMManager *wm = NULL;
MBWMDecorType type = 0;
MBWMObjectProp prop;
int abs_packing = 0;
@@ -50,7 +50,7 @@ mb_wm_decor_init (MBWMObject *obj, va_list vap)
switch (prop)
{
case MBWMObjectPropWm:
- wm = va_arg(vap, MBWindowManager *);
+ wm = va_arg(vap, MBWMManager *);
break;
case MBWMObjectPropDecorType:
type = va_arg(vap, MBWMDecorType);
@@ -200,7 +200,7 @@ mb_wm_decor_release_handler (XButtonEvent *xev,
void *userdata)
{
MBWMDecor *decor = userdata;
- MBWindowManager *wm = decor->parent_client->wmref;
+ MBWMManager *wm = decor->parent_client->wmref;
mb_wm_main_context_x_event_handler_remove (wm->main_ctx, ButtonRelease,
decor->release_cb_id);
@@ -217,7 +217,7 @@ mb_wm_decor_press_handler (XButtonEvent *xev,
void *userdata)
{
MBWMDecor *decor = userdata;
- MBWindowManager *wm = decor->parent_client->wmref;
+ MBWMManager *wm = decor->parent_client->wmref;
Bool retval = True;
if (xev->window == decor->xwin)
@@ -319,7 +319,7 @@ mb_wm_decor_press_handler (XButtonEvent *xev,
static Bool
mb_wm_decor_sync_window (MBWMDecor *decor)
{
- MBWindowManager *wm;
+ MBWMManager *wm;
XSetWindowAttributes attr;
if (decor->parent_client == NULL)
@@ -410,7 +410,7 @@ mb_wm_decor_sync_window (MBWMDecor *decor)
static Bool
mb_wm_decor_reparent (MBWMDecor *decor)
{
- MBWindowManager *wm;
+ MBWMManager *wm;
if (decor->parent_client == NULL)
return False;
@@ -438,7 +438,7 @@ mb_wm_decor_reparent (MBWMDecor *decor)
static void
mb_wm_decor_calc_geometry (MBWMDecor *decor)
{
- MBWindowManager *wm;
+ MBWMManager *wm;
MBWindowManagerClient *client;
int n, s, w, e;
@@ -542,7 +542,7 @@ mb_wm_decor_handle_resize (MBWMDecor *decor)
}
MBWMDecor*
-mb_wm_decor_new (MBWindowManager *wm,
+mb_wm_decor_new (MBWMManager *wm,
MBWMDecorType type)
{
MBWMObject *decor;
@@ -690,7 +690,7 @@ static void
mb_wm_decor_button_stock_button_action (MBWMDecorButton *button)
{
MBWindowManagerClient *client = button->decor->parent_client;
- MBWindowManager *wm = client->wmref;
+ MBWMManager *wm = client->wmref;
switch (button->type)
{
@@ -746,7 +746,7 @@ mb_wm_decor_button_press_handler (XButtonEvent *xev,
{
MBWMDecorButton *button = (MBWMDecorButton *)userdata;
MBWMDecor *decor = button->decor;
- MBWindowManager *wm = decor->parent_client->wmref;
+ MBWMManager *wm = decor->parent_client->wmref;
GList *l = NULL;
Bool retval = True;
@@ -950,7 +950,7 @@ static int
mb_wm_decor_button_init (MBWMObject *obj, va_list vap)
{
MBWMDecorButton *button = MB_WM_DECOR_BUTTON (obj);
- MBWindowManager *wm = NULL;
+ MBWMManager *wm = NULL;
MBWMDecor *decor = NULL;
MBWMDecorButtonPressedFunc press = NULL;
MBWMDecorButtonReleasedFunc release = NULL;
@@ -965,7 +965,7 @@ mb_wm_decor_button_init (MBWMObject *obj, va_list vap)
switch (prop)
{
case MBWMObjectPropWm:
- wm = va_arg(vap, MBWindowManager *);
+ wm = va_arg(vap, MBWMManager *);
break;
case MBWMObjectPropDecor:
decor = va_arg(vap, MBWMDecor*);
@@ -1076,7 +1076,7 @@ static void
mb_wm_decor_button_realize (MBWMDecorButton *button)
{
MBWMDecor *decor = button->decor;
- MBWindowManager *wm = decor->parent_client->wmref;
+ MBWMManager *wm = decor->parent_client->wmref;
button->press_cb_id =
mb_wm_main_context_x_event_handler_add (wm->main_ctx,
@@ -1120,7 +1120,7 @@ mb_wm_decor_button_move_to (MBWMDecorButton *button, int x, int y)
}
MBWMDecorButton*
-mb_wm_decor_button_new (MBWindowManager *wm,
+mb_wm_decor_button_new (MBWMManager *wm,
MBWMDecorButtonType type,
MBWMDecorButtonPack pack,
MBWMDecor *decor,
@@ -1144,7 +1144,7 @@ mb_wm_decor_button_new (MBWindowManager *wm,
}
MBWMDecorButton*
-mb_wm_decor_button_stock_new (MBWindowManager *wm,
+mb_wm_decor_button_stock_new (MBWMManager *wm,
MBWMDecorButtonType type,
MBWMDecorButtonPack pack,
MBWMDecor *decor,