diff options
| author | infirit <[email protected]> | 2014-05-17 05:15:56 +0200 |
|---|---|---|
| committer | infirit <[email protected]> | 2014-09-23 13:31:02 +0200 |
| commit | 94dcb761b95ee54ef1f1512d59721932d75ffb7f (patch) | |
| tree | 60f89e8174ffc3133c0f1758e2f43408b510c02b /shell | |
| parent | 53bb92a83092a70170f85d75491c5b0b881455bc (diff) | |
| download | atril-94dcb761b95ee54ef1f1512d59721932d75ffb7f.tar.bz2 atril-94dcb761b95ee54ef1f1512d59721932d75ffb7f.tar.xz | |
Fix glib deprecations
Based on evince commit by Carlos Garcia Campos <[email protected]>
Url: https://git.gnome.org/browse/evince/commit/?id=bf90f90e0af99bbfdd20e6d21fd228c05cffae51
Url: https://git.gnome.org/browse/evince/commit/?id=76151be92239ed5f491cb26c87a2328b670e9f64
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/ev-daemon.c | 2 | ||||
| -rw-r--r-- | shell/main.c | 6 |
2 files changed, 0 insertions, 8 deletions
diff --git a/shell/ev-daemon.c b/shell/ev-daemon.c index e9c2f0ae..c242e550 100644 --- a/shell/ev-daemon.c +++ b/shell/ev-daemon.c @@ -521,8 +521,6 @@ main (gint argc, gchar **argv) g_set_prgname ("atril-daemon"); - g_type_init (); - loop = g_main_loop_new (NULL, FALSE); pending_invocations = g_hash_table_new_full (g_str_hash, diff --git a/shell/main.c b/shell/main.c index 3164d3da..367e0977 100644 --- a/shell/main.c +++ b/shell/main.c @@ -260,12 +260,6 @@ main (int argc, char *argv[]) } #endif -#if !GLIB_CHECK_VERSION (2, 32, 0) - /* Init glib threads asap */ - if (!g_thread_supported ()) - g_thread_init (NULL); -#endif - #ifdef ENABLE_NLS /* Initialize the i18n stuff */ bindtextdomain (GETTEXT_PACKAGE, ev_get_locale_dir()); |