DeforaOS/Panel
DeforaOS/Panel
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

panel-test now uses the Plugin class as well

Browse Source
This commit is contained in:
Pierre Pronchery 2012-09-27 18:29:52 +00:00
parent 06baf20806
commit e7d4425e3c
2 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/notify.c
View File

@ -34,6 +34,13 @@
#define PACKAGE "panel-notify"
#include "helper.c"
#ifndef PREFIX
# define PREFIX "/usr/local"
#endif
#ifndef LIBDIR
# define LIBDIR PREFIX "/lib"
#endif
/* private */
/* prototypes */

36
tools/test.c
View File

@ -21,18 +21,25 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <dlfcn.h>
#include <gtk/gtk.h>
#include <System.h>
#include <Desktop.h>
#include "../src/panel.h"
#include "../config.h"
#ifdef PACKAGE
# undef PACKAGE
#endif
#define PACKAGE "panel-test"
#include "helper.c"
#ifndef PREFIX
# define PREFIX "/usr/local"
#endif
#ifndef LIBDIR
# define LIBDIR PREFIX "/lib"
#endif
/* private */
/* prototypes */
@ -46,19 +53,10 @@ static int _test(GtkIconSize iconsize, char * applets[])
{
Panel panel;
char * filename;
char const path[] = PREFIX "/lib/Panel/applets/";
#ifdef __APPLE__
char const ext[] = ".dylib";
#else
char const ext[] = ".so";
#endif
GtkWidget * box;
GtkWidget * widget;
size_t i;
size_t len;
char * p = NULL;
char * q;
void * dl;
Plugin * plugin;
PanelAppletHelper helper;
PanelAppletDefinition * pad;
PanelApplet * pa;
@ -77,20 +75,15 @@ static int _test(GtkIconSize iconsize, char * applets[])
_helper_init(&helper, &panel, PANEL_APPLET_TYPE_NORMAL, iconsize);
for(i = 0; applets[i] != NULL; i++)
{
len = sizeof(path) + strlen(applets[i]) + sizeof(ext);
if((q = realloc(p, len)) == NULL)
break;
p = q;
snprintf(p, len, "%s%s%s", path, applets[i], ext);
if((dl = dlopen(p, RTLD_LAZY)) == NULL)
if((plugin = plugin_new(LIBDIR, "Panel", "applets", applets[i]))
== NULL)
{
fprintf(stderr, "%s: %s: %s\n", "panel-test",
applets[i], dlerror());
error_print(PACKAGE);
continue;
}
if((pad = dlsym(dl, "applet")) == NULL)
if((pad = plugin_lookup(plugin, "applet")) == NULL)
{
dlclose(dl);
plugin_delete(plugin);
continue;
}
widget = NULL;
@ -99,7 +92,6 @@ static int _test(GtkIconSize iconsize, char * applets[])
gtk_box_pack_start(GTK_BOX(box), widget, pad->expand,
pad->fill, 0);
}
free(p);
gtk_container_add(GTK_CONTAINER(panel.window), box);
gtk_widget_show_all(panel.window);
panel.timeout = 0;