diff options
| author | Christian Dywan <christian@twotoasts.de> | 2017-10-06 01:13:58 +0200 |
|---|---|---|
| committer | Christian Dywan <christian@twotoasts.de> | 2017-10-06 01:13:58 +0200 |
| commit | 0c4d3b94b85305a005e97a77c31464b709729676 (patch) | |
| tree | 09651977bd29089d079c8897378adb66403cbf1c | |
| parent | f51588987ed57b8d4e76096371773e3f8a4d1b11 (diff) | |
| download | midori-git-0c4d3b94b85305a005e97a77c31464b709729676.tar.gz | |
Disable Zeitgeist and check error != NULL
| -rw-r--r-- | midori/midori-view.c | 6 | ||||
| -rw-r--r-- | snap/snapcraft.yaml | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/midori/midori-view.c b/midori/midori-view.c index 085a93ed..9af39810 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -446,8 +446,10 @@ midori_view_apply_icon (MidoriView* view, pixbuf = gtk_icon_info_load_icon (icon_info, &error); g_strfreev (icon_names); if (pixbuf == NULL) { - g_warning ("Could not load pixbuf for icon '%s': %s\n", icon_name, error->message); - g_clear_error (&error); + if (error != NULL) { + g_warning ("Could not load pixbuf for icon '%s': %s\n", icon_name, error->message); + g_clear_error (&error); + } /* view->icon cannot be set to NULL, so we simply leave it as-is */ return; diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index bf8acdb3..9acccb96 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -63,12 +63,12 @@ parts: configflags: - -DCMAKE_INSTALL_DATADIR=/usr/share - -DHALF_BRO_INCOM_WEBKIT2=1 + - -DUSE_ZEITGEIST=0 build-packages: - bzr - valac - libwebkit2gtk-4.0-dev - libsoup-gnome2.4-dev - - libzeitgeist-2.0-dev - libgcr-3-dev - libsqlite3-dev - librsvg2-bin @@ -82,7 +82,6 @@ parts: stage-packages: - libwebkit2gtk-4.0-37 - libcanberra-gtk3-module - - libc-bin - myspell-en-us - gnome-icon-theme-symbolic - gstreamer1.0-x |