diff options
author | Christian Persch <chpe@cvs.gnome.org> | 2005-07-06 11:10:37 (GMT) |
---|---|---|
committer | Christian Persch <chpe@src.gnome.org> | 2005-07-06 11:10:37 (GMT) |
commit | 9c4285f1754fba201f7355df46dcf589910e15bb (patch) | |
tree | 4758602693f3d618fe088f73ee5096db01753307 /shell | |
parent | 938636d838432d71cd8ed1c2aa1604faa6f8d083 (diff) |
Fix DBUS configure checks.
2005-07-06 Christian Persch <chpe@cvs.gnome.org>
* configure.ac:
Fix DBUS configure checks.
* shell/ev-metadata-manager.c: (ev_metadata_manager_set_int),
(ev_metadata_manager_set_double), (ev_metadata_manager_set_string),
(ev_metadata_manager_set_boolean):
Plug mem leaks.
* shell/ev-window.c: (page_changed_cb), (ev_window_run_fullscreen),
(ev_window_stop_fullscreen), (ev_window_run_presentation),
(ev_window_stop_presentation), (ev_window_zoom_changed_cb),
(ev_window_continuous_changed_cb),
(ev_window_dual_mode_changed_cb), (ev_window_new):
Fix the build without DBUS.
Diffstat (limited to 'shell')
-rw-r--r-- | shell/ev-metadata-manager.c | 8 | ||||
-rw-r--r-- | shell/ev-window.c | 20 |
2 files changed, 26 insertions, 2 deletions
diff --git a/shell/ev-metadata-manager.c b/shell/ev-metadata-manager.c index 6e709e3..053ef94 100644 --- a/shell/ev-metadata-manager.c +++ b/shell/ev-metadata-manager.c @@ -560,6 +560,8 @@ ev_metadata_manager_set_int (const gchar *uri, const gchar *key, int value) g_value_set_int (&val, value); ev_metadata_manager_set (uri, key, &val); + + g_value_unset (&value); } void @@ -571,6 +573,8 @@ ev_metadata_manager_set_double (const gchar *uri, const gchar *key, double value g_value_set_double (&val, value); ev_metadata_manager_set (uri, key, &val); + + g_value_unset (&value); } void @@ -582,6 +586,8 @@ ev_metadata_manager_set_string (const gchar *uri, const gchar *key, const gchar g_value_set_string (&val, value); ev_metadata_manager_set (uri, key, &val); + + g_value_unset (&value); } void @@ -593,4 +599,6 @@ ev_metadata_manager_set_boolean (const gchar *uri, const gchar *key, gboolean va g_value_set_boolean (&val, value); ev_metadata_manager_set (uri, key, &val); + + g_value_unset (&value); } diff --git a/shell/ev-window.c b/shell/ev-window.c index 88392d9..4aef9af 100644 --- a/shell/ev-window.c +++ b/shell/ev-window.c @@ -619,7 +619,9 @@ page_changed_cb (EvPageCache *page_cache, { update_action_sensitivity (ev_window); +#ifdef ENABLE_METADATA ev_metadata_manager_set_int (ev_window->priv->uri, "page", page); +#endif } static void @@ -1736,7 +1738,9 @@ ev_window_run_fullscreen (EvWindow *window) gtk_window_fullscreen (GTK_WINDOW (window)); ev_window_update_fullscreen_popup (window); +#ifdef ENABLE_METADATA ev_metadata_manager_set_boolean (window->priv->uri, "fullscreen", TRUE); +#endif } static void @@ -1764,7 +1768,9 @@ ev_window_stop_fullscreen (EvWindow *window) gtk_window_unfullscreen (GTK_WINDOW (window)); update_chrome_visibility (window); +#ifdef ENABLE_METADATA ev_metadata_manager_set_boolean (window->priv->uri, "fullscreen", FALSE); +#endif } static void @@ -1810,7 +1816,9 @@ ev_window_run_presentation (EvWindow *window) ev_window_update_presentation_action (window); update_chrome_visibility (window); +#ifdef ENABLE_METADATA ev_metadata_manager_set_boolean (window->priv->uri, "presentation", TRUE); +#endif } static void @@ -1827,7 +1835,9 @@ ev_window_stop_presentation (EvWindow *window) ev_window_update_presentation_action (window); update_chrome_visibility (window); +#ifdef ENABLE_METADATA ev_metadata_manager_set_boolean (window->priv->uri, "presentation", FALSE); +#endif } static void @@ -2241,8 +2251,10 @@ ev_window_zoom_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *ev_window) { update_action_sensitivity (ev_window); +#ifdef ENABLE_METADATA ev_metadata_manager_set_double (ev_window->priv->uri, "zoom", ev_view_get_zoom (EV_VIEW (ev_window->priv->view))); +#endif } static void @@ -2277,16 +2289,22 @@ static void ev_window_continuous_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *ev_window) { ev_window_update_continuous_action (ev_window); + +#ifdef ENABLE_METADATA ev_metadata_manager_set_boolean (ev_window->priv->uri, "continuous", ev_view_get_continuous (EV_VIEW (ev_window->priv->view))); +#endif } static void ev_window_dual_mode_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *ev_window) { ev_window_update_dual_page_action (ev_window); + +#ifdef ENABLE_METADATA ev_metadata_manager_set_boolean (ev_window->priv->uri, "dual-page", ev_view_get_dual_page (EV_VIEW (ev_window->priv->view))); +#endif } static char * @@ -3453,5 +3471,3 @@ ev_window_new (void) return ev_window; } - - |