手元にあった変更をコミット。よく覚えてない
gdestraier/trunc/configure.in (diff)
gdestraier/trunc/src/dbus-server.cpp (diff) gdestraier/trunc/src/hyperestraier/local.hpp (diff)| @@ -87,7 +87,7 @@ | ||
| 87 | 87 | PKG_CHECK_MODULES(GNOMEUI, libgnomeui-2.0 >= 2.8.1) |
| 88 | 88 | PKG_CHECK_MODULES(GNOMEVFS, gnome-vfs-2.0 >= 2.8.4) |
| 89 | 89 | PKG_CHECK_MODULES(GCONF, gconf-2.0 >= 2.8.1) |
| 90 | -PKG_CHECK_MODULES(HYPERESTRAIER, hyperestraier >= 1.0.3) | |
| 90 | +PKG_CHECK_MODULES(HYPERESTRAIER, hyperestraier >= 1.3.6) | |
| 91 | 91 | PKG_CHECK_MODULES(LIBXMLPP, libxml++-2.6 >= 2.6.1) |
| 92 | 92 | PKG_CHECK_MODULES(EEL2, eel-2.0 >= 2.8.2) |
| 93 | 93 |
| @@ -72,7 +72,7 @@ | ||
| 72 | 72 | (void*)this ) ) { |
| 73 | 73 | ::g_warning("D-BUS: Failed to register object path."); |
| 74 | 74 | ::dbus_connection_remove_filter(conn, &server::filter_func, 0); |
| 75 | - ::dbus_connection_disconnect(conn); | |
| 75 | + ::dbus_connection_close(conn); | |
| 76 | 76 | ::dbus_connection_unref(conn); |
| 77 | 77 | return E_CONNECT_FAIL; |
| 78 | 78 | } |
| @@ -86,7 +86,7 @@ | ||
| 86 | 86 | ::dbus_error_free(&err); |
| 87 | 87 | ::dbus_connection_unregister_object_path(conn, GDESTRAIER_OBJECT_PATH); |
| 88 | 88 | ::dbus_connection_remove_filter(conn, &server::filter_func, 0); |
| 89 | - ::dbus_connection_disconnect(conn); | |
| 89 | + ::dbus_connection_close(conn); | |
| 90 | 90 | ::dbus_connection_unref(conn); |
| 91 | 91 | |
| 92 | 92 | return E_CONNECT_FAIL; |
| @@ -109,7 +109,7 @@ | ||
| 109 | 109 | connection_ = 0; |
| 110 | 110 | ::dbus_connection_unregister_object_path(conn, GDESTRAIER_OBJECT_PATH); |
| 111 | 111 | ::dbus_connection_remove_filter(conn, &server::filter_func, 0); |
| 112 | - ::dbus_connection_disconnect(conn); | |
| 112 | + ::dbus_connection_close(conn); | |
| 113 | 113 | ::dbus_connection_unref(conn); |
| 114 | 114 | |
| 115 | 115 | return E_SUCCESS; |
| @@ -25,7 +25,7 @@ | ||
| 25 | 25 | /** @brief データベースに発生したイベントを受け取るコールバック型 |
| 26 | 26 | * @param message イベントの内容を表すメッセージ文字列 |
| 27 | 27 | */ |
| 28 | - typedef void (*informer_type)(char const* message); | |
| 28 | + typedef void (*informer_type)(char const* message, void*); | |
| 29 | 29 | |
| 30 | 30 | namespace detail { |
| 31 | 31 |
| @@ -169,7 +169,7 @@ | ||
| 169 | 169 | static inline double size(estdb_type* db) { RT(size, THREADING)(db); } \ |
| 170 | 170 | static inline int* search(estdb_type* db, ESTCOND* cond, int* nump, CBMAP* hints) { RT(search, THREADING)(db, cond, nump, hints); } \ |
| 171 | 171 | static inline void set_cache_size(estdb_type* db, size_t size, int anum, int tnum, int rnum) { RT(set_cache_size, THREADING)(db, size, anum, tnum, rnum); } \ |
| 172 | - static inline void set_informer(estdb_type* db, informer_type f) { RT(set_informer, THREADING)(db, f); } \ | |
| 172 | + static inline void set_informer(estdb_type* db, informer_type f, void* opaque) { RT(set_informer, THREADING)(db, f, opaque); } \ | |
| 173 | 173 | static inline int scan_doc(estdb_type* db, ESTDOC* doc, ESTCOND* cond) { RT(scan_doc, THREADING)(db, doc, cond); } |
| 174 | 174 | |
| 175 | 175 |
