Merge branch 'master' of git+ssh://openadk.org/git/openadk

1 files changed, 0 insertions, 29 deletions

diff --git a/package/lxpanel/patches/patch-src_plugins_batt_batt_c b/package/lxpanel/patches/patch-src_plugins_batt_batt_c
deleted file mode 100644
index 33467abc1..000000000
--- a/package/lxpanel/patches/patch-src_plugins_batt_batt_c
+++ /dev/null
@@ -1,29 +0,0 @@
---- lxpanel-0.5.6.orig/src/plugins/batt/batt.c	2010-02-08 07:37:52.000000000 +0100
-+++ lxpanel-0.5.6/src/plugins/batt/batt.c	2011-04-14 22:05:34.617672290 +0200
-@@ -95,7 +95,7 @@ typedef struct {
- typedef struct {
-     char *command;
-     sem_t *lock;
--} alarm;
-+} alarms;
- 
- static void destructor(Plugin *p);
- static void update_display(lx_battery *lx_b, gboolean repaint);
-@@ -103,7 +103,7 @@ static void update_display(lx_battery *l
- /* alarmProcess takes the address of a dynamically allocated alarm struct (which
-    it must free). It ensures that alarm commands do not run concurrently. */
- static void * alarmProcess(void *arg) {
--    alarm *a = (alarm *) arg;
-+    alarms *a = (alarms *) arg;
- 
-     sem_wait(a->lock);
-     system(a->command);
-@@ -157,7 +157,7 @@ void update_display(lx_battery *lx_b, gb
- 	/* Run the alarm command if it isn't already running */
- 	if (alarmCanRun) {
- 	    
--	    alarm *a = (alarm *) malloc(sizeof(alarm));
-+	    alarms *a = (alarms *) malloc(sizeof(alarms));
- 	    a->command = lx_b->alarmCommand;
- 	    a->lock = &(lx_b->alarmProcessLock);
-