31 lines
831 B
Diff
31 lines
831 B
Diff
|
commit 343df29553a126f29b5379fefeb7c2cfd1adc073
|
||
|
Author: Tobias Ellinghaus <me@houz.org>
|
||
|
Date: Sat Sep 15 11:53:25 2012 +0200
|
||
|
|
||
|
Hopefully fix #8931 with an ugly hack
|
||
|
|
||
|
diff --git a/src/iop/watermark.c b/src/iop/watermark.c
|
||
|
index bcd65d6..e3da730 100644
|
||
|
--- a/src/iop/watermark.c
|
||
|
+++ b/src/iop/watermark.c
|
||
|
@@ -36,7 +36,10 @@
|
||
|
#include <inttypes.h>
|
||
|
|
||
|
#include <librsvg/rsvg.h>
|
||
|
+// ugh, ugly hack. why do people break stuff all the time?
|
||
|
+#ifndef RSVG_CAIRO_H
|
||
|
#include <librsvg/rsvg-cairo.h>
|
||
|
+#endif
|
||
|
|
||
|
#include "common/metadata.h"
|
||
|
#include "common/utility.h"
|
||
|
@@ -712,7 +715,7 @@ static void refresh_watermarks( dt_iop_module_t *self )
|
||
|
snprintf(filename, DT_MAX_PATH_LEN, "%s/%s", configdir, d_name);
|
||
|
gtk_combo_box_append_text( g->combobox1, d_name );
|
||
|
count++;
|
||
|
- }
|
||
|
+ }
|
||
|
g_dir_close(dir) ;
|
||
|
}
|
||
|
|