[yelp/new-aday-design: 9/11] Merge branch 'master' into new-aday-design

[Shaun McCance <shaunm src gnome org>]

commit 5fedb1eab1ea41fc87c0416eb91344c4cf6af7f7
Merge: 780c67e 4d9d874
Author: Shaun McCance <shaunm gnome org>
Date:   Mon Jun 16 17:15:38 2014 -0400

    Merge branch 'master' into new-aday-design
    
    Conflicts:
        src/yelp-window.c

 NEWS                          |   17 ++
 configure.ac                  |    2 +-
 libyelp/yelp-location-entry.c |   10 +-
 libyelp/yelp-view.c           |   14 +-
 po/id.po                      |  278 +++++++++++++++++-----------------
 po/ru.po                      |   28 ++--
 po/sv.po                      |  339 +++++++++++++++++++++--------------------
 src/yelp-application.c        |   29 +++--
 src/yelp-window.c             |    2 +-
 yelp.doap                     |    3 +-
 10 files changed, 382 insertions(+), 340 deletions(-)
---
diff --cc src/yelp-window.c
index 3ffaccb,e84e226..6cac290
--- a/src/yelp-window.c
+++ b/src/yelp-window.c
@@@ -258,8 -319,28 +258,8 @@@ yelp_window_dispose (GObject *object
  {
      YelpWindowPrivate *priv = GET_PRIV (object);
  
 -    if (priv->history) {
 -        g_object_unref (priv->history);
 -        priv->history = NULL;
 -    }
 -
 -    if (priv->action_group) {
 -        g_object_unref (priv->action_group);
 -        priv->action_group = NULL;
 -    }
 -
 -    if (priv->bookmark_actions) {
 -        g_object_unref (priv->bookmark_actions);
 -        priv->bookmark_actions = NULL;
 -    }
 -
 -    if (priv->read_later_changed) {
 -        g_signal_handler_disconnect (priv->application, priv->read_later_changed);
 -        priv->read_later_changed = 0;
 -    }
 -
      if (priv->bookmarks_changed) {
-         g_source_remove (priv->bookmarks_changed);
+         g_signal_handler_disconnect (priv->application, priv->bookmarks_changed);
          priv->bookmarks_changed = 0;
      }