From 54bf2ac0ed59a10a51405ee9f14de5eb9d503148 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <mpg@redhat.com>
Date: Thu, 07 Jul 2005 14:57:39 +0000
Subject: Add an _init functions that enabled metadata management at runtime.

2005-07-07  Marco Pesenti Gritti  <mpg@redhat.com>

        * shell/ev-metadata-manager.c: (ev_metadata_manager_init),
        (ev_metadata_manager_get), (ev_metadata_manager_set):
        * shell/ev-metadata-manager.h:

        Add an _init functions that enabled metadata management
        at runtime.

        * shell/ev-window.c: (page_changed_cb),
        (setup_document_from_metadata), (ev_window_setup_document),
        (setup_view_from_metadata), (ev_window_open_uri),
        (ev_window_run_fullscreen), (ev_window_stop_fullscreen),
        (ev_window_run_presentation), (ev_window_stop_presentation),
        (save_sizing_mode), (ev_window_zoom_changed_cb),
        (ev_window_continuous_changed_cb),
        (ev_window_dual_mode_changed_cb), (window_state_event_cb),
        (window_configure_event_cb):

        Remove all ugly metadata define since we deal with it
        at runtime now.

        * shell/main.c: (load_files_remote), (main):

        Add support for dbus cvs head. Hopefully didnt break one
        of the other versions now!

        If we dont get a response from the dbus server just
        give up with it and not enable metadata.
---
(limited to 'shell/ev-metadata-manager.c')

diff --git a/shell/ev-metadata-manager.c b/shell/ev-metadata-manager.c
index 712f124..2bbd291 100644
--- a/shell/ev-metadata-manager.c
+++ b/shell/ev-metadata-manager.c
@@ -87,12 +87,9 @@ item_free (gpointer data)
 	g_free (item);
 }
 
-static gboolean
+void
 ev_metadata_manager_init (void)
 {
-	if (ev_metadata_manager != NULL)
-		return TRUE;
-
 	ev_metadata_manager = g_new0 (GeditMetadataManager, 1);
 
 	ev_metadata_manager->values_loaded = FALSE;
@@ -110,8 +107,6 @@ ev_metadata_manager_init (void)
 				    (GSourceFunc)ev_metadata_manager_save,
 				    NULL,
 				    NULL);
-	
-	return TRUE;
 }
 
 /* This function must be called before exiting ev */
@@ -303,7 +298,7 @@ ev_metadata_manager_get (const gchar *uri,
 	g_return_val_if_fail (key != NULL, FALSE);
 
 	if (ev_metadata_manager == NULL)
-		ev_metadata_manager_init ();
+		return FALSE;
 
 	if (!ev_metadata_manager->values_loaded)
 	{
@@ -358,7 +353,7 @@ ev_metadata_manager_set (const gchar  *uri,
 	g_return_if_fail (key != NULL);
 
 	if (ev_metadata_manager == NULL)
-		ev_metadata_manager_init ();
+		return;
 
 	if (!ev_metadata_manager->values_loaded)
 	{
--
cgit v0.9.1