summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorracarr <racarr>2007-01-28 23:59:03 +0000
committerracarr <racarr>2007-01-28 23:59:03 +0000
commitf8e74debc0ef47fe8f216165e25a0c89606bf883 (patch)
tree012646a285154fc76669ad1d89e59a24e75239b6
parent45f5dd4ac0a2fd06a48c9cb85fcd37cd35baf851 (diff)
downloadberyl-desktop-manager-f8e74debc0ef47fe8f216165e25a0c89606bf883.tar.gz
beryl-desktop-manager-f8e74debc0ef47fe8f216165e25a0c89606bf883.tar.bz2
Remove setBDMWidget and pass to initWidget
-rw-r--r--src/bdm.c4
-rw-r--r--src/bdm.h3
2 files changed, 2 insertions, 5 deletions
diff --git a/src/bdm.c b/src/bdm.c
index d22ae28..41f322f 100644
--- a/src/bdm.c
+++ b/src/bdm.c
@@ -225,7 +225,6 @@ static int loadWidget (char * path)
widget->getTexts = dlsym (widgetDL, "getTexts");
widget->handleEvent = dlsym (widgetDL, "handleEvent");
- widget->setBDMWidget = dlsym (widgetDL, "setBDMWidget");
widget->images = widget->getImages ();
widget->texts = widget->getTexts ();
@@ -234,8 +233,7 @@ static int loadWidget (char * path)
widget->prev->next = widget;
widget->next = NULL;
- widget->initWidget ();
- widget->setBDMWidget (widget);
+ widget->initWidget (widget);
Widgets = g_slist_append (Widgets, widget);
diff --git a/src/bdm.h b/src/bdm.h
index b72e4e0..25f0775 100644
--- a/src/bdm.h
+++ b/src/bdm.h
@@ -119,7 +119,7 @@ typedef struct _BDMEvent
// Add more useful stuff
} BDMEvent;
-typedef int (*BDMWidgetInitProc) (void);
+typedef int (*BDMWidgetInitProc) (BDMWidget * widget);
typedef int (*BDMWidgetFiniProc) (void);
typedef int (*BDMWidgetUpdateProc) (void);
@@ -146,7 +146,6 @@ struct _BDMWidget
BDMWidgetGetTextProc getTexts;
BDMWidgetHandleEventProc handleEvent;
- BDMWidgetSetBDMWidgetProc setBDMWidget;
};