summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorinfirit <[email protected]>2014-05-17 15:33:36 +0200
committerinfirit <[email protected]>2014-07-24 18:05:54 +0200
commit7654cb5af09a0e7522f1fdffce5ab6b469303790 (patch)
tree3e02906bf9ac38ef1793a69f96c65504f549556d /src
parent5c5c6ea8eaa76516469350ebaf880e3a43934d78 (diff)
downloadeom-7654cb5af09a0e7522f1fdffce5ab6b469303790.tar.bz2
eom-7654cb5af09a0e7522f1fdffce5ab6b469303790.tar.xz
Fix glib/librsvg deprecation
librsvg: Only inlcude rsvg.h and remove calls to rsvg_init glib: Remove call to g_thread_init and use g_value_*_schar
Diffstat (limited to 'src')
-rw-r--r--src/eom-job-queue.c2
-rw-r--r--src/eom-print.c2
-rw-r--r--src/eom-scroll-view.c1
-rw-r--r--src/eom-uri-converter.c4
-rw-r--r--src/main.c9
5 files changed, 3 insertions, 15 deletions
diff --git a/src/eom-job-queue.c b/src/eom-job-queue.c
index ea0d1a7..007e0a3 100644
--- a/src/eom-job-queue.c
+++ b/src/eom-job-queue.c
@@ -154,8 +154,6 @@ eom_render_thread (gpointer data)
void
eom_job_queue_init (void)
{
- if (!g_thread_supported ()) g_thread_init (NULL);
-
render_cond = g_cond_new ();
eom_queue_mutex = g_mutex_new ();
diff --git a/src/eom-print.c b/src/eom-print.c
index 91a3f88..f0329ec 100644
--- a/src/eom-print.c
+++ b/src/eom-print.c
@@ -30,7 +30,7 @@
#include "eom-debug.h"
#ifdef HAVE_RSVG
-#include <librsvg/rsvg-cairo.h>
+#include <librsvg/rsvg.h>
#endif
#define EOM_PRINT_SETTINGS_FILE "eom-print-settings.ini"
diff --git a/src/eom-scroll-view.c b/src/eom-scroll-view.c
index 35400be..a82fc75 100644
--- a/src/eom-scroll-view.c
+++ b/src/eom-scroll-view.c
@@ -8,7 +8,6 @@
#include <gdk/gdkkeysyms.h>
#ifdef HAVE_RSVG
#include <librsvg/rsvg.h>
-#include <librsvg/rsvg-cairo.h>
#endif
#include "eom-marshal.h"
diff --git a/src/eom-uri-converter.c b/src/eom-uri-converter.c
index 738820c..6382e74 100644
--- a/src/eom-uri-converter.c
+++ b/src/eom-uri-converter.c
@@ -197,7 +197,7 @@ eom_uri_converter_set_property (GObject *object,
break;
case PROP_SPACE_CHARACTER:
- priv->space_character = g_value_get_char (value);
+ priv->space_character = g_value_get_schar (value);
break;
case PROP_COUNTER_START:
@@ -249,7 +249,7 @@ eom_uri_converter_get_property (GObject *object,
break;
case PROP_SPACE_CHARACTER:
- g_value_set_char (value, priv->space_character);
+ g_value_set_schar (value, priv->space_character);
break;
case PROP_COUNTER_START:
diff --git a/src/main.c b/src/main.c
index 838f8db..ff59af5 100644
--- a/src/main.c
+++ b/src/main.c
@@ -185,9 +185,6 @@ main (int argc, char **argv)
GError *error = NULL;
GOptionContext *ctx;
- if (!g_thread_supported ())
- g_thread_init (NULL);
-
bindtextdomain (GETTEXT_PACKAGE, EOM_LOCALE_DIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
@@ -231,9 +228,6 @@ main (int argc, char **argv)
#ifdef HAVE_EXEMPI
xmp_init();
#endif
-#ifdef HAVE_RSVG
- rsvg_init();
-#endif
eom_debug_init ();
eom_job_queue_init ();
gdk_threads_init ();
@@ -260,9 +254,6 @@ main (int argc, char **argv)
eom_plugin_engine_shutdown ();
-#ifdef HAVE_RSVG
- rsvg_term();
-#endif
#ifdef HAVE_EXEMPI
xmp_terminate();
#endif