diff options
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | midori/midori-browser.c | 34 |
2 files changed, 26 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4031d56f..2735df7b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -180,11 +180,11 @@ else () endif() if (USE_ZEITGEIST) - pkg_check_modules(ZEITGEIST zeitgeist-1.0>=0.3.14) + pkg_check_modules(ZEITGEIST zeitgeist-2.0>=0.3.14) set(OPTS_INCLUDE_DIRS "${OPTS_INCLUDE_DIRS};${ZEITGEIST_INCLUDE_DIRS}") set(OPTS_LIBRARIES "${OPTS_LIBRARIES};${ZEITGEIST_LIBRARIES}") add_definitions("-DHAVE_ZEITGEIST") - set(PKGS ${PKGS} zeitgeist-1.0) + set(PKGS ${PKGS} zeitgeist-2.0) endif() if (WIN32) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 54c25bb5..b49d39ea 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -463,6 +463,9 @@ midori_browser_update_history (KatzeItem* item, #ifdef HAVE_ZEITGEIST const gchar* inter; + ZeitgeistEvent* zgevent; + ZeitgeistSubject* zgsubject; + if (strstr (event, "access")) inter = ZEITGEIST_ZG_ACCESS_EVENT; else if (strstr (event, "leave")) @@ -480,16 +483,27 @@ midori_browser_update_history (KatzeItem* item, if (KATZE_ITEM_IS_FOLDER (item)) return; - zeitgeist_log_insert_events_no_reply (zeitgeist_log_get_default (), - zeitgeist_event_new_full (inter, ZEITGEIST_ZG_USER_ACTIVITY, - "application://midori.desktop", - zeitgeist_subject_new_full ( - katze_item_get_uri (item), - strstr (type, "bookmark") ? ZEITGEIST_NFO_BOOKMARK : ZEITGEIST_NFO_WEBSITE, - zeitgeist_manifestation_for_uri (katze_item_get_uri (item)), - katze_item_get_meta_string (item, "mime-type"), NULL, katze_item_get_name (item), NULL), - NULL), - NULL); + zgsubject = zeitgeist_subject_new_full ( + katze_item_get_uri (item), + strstr (type, "bookmark") ? ZEITGEIST_NFO_BOOKMARK : ZEITGEIST_NFO_WEBSITE, + zeitgeist_manifestation_for_uri (katze_item_get_uri (item)), + katze_item_get_meta_string (item, "mime-type"), + NULL, + katze_item_get_name (item), + NULL), + + zgevent = zeitgeist_event_new_full ( + inter, + ZEITGEIST_ZG_USER_ACTIVITY, + "application://midori.desktop", + NULL, + zgsubject, + NULL), + + zeitgeist_log_insert_event_no_reply (zeitgeist_log_get_default (), zgevent, NULL); + + g_object_unref (zgevent); + g_object_unref (zgsubject); #endif } |