diff options
| author | Marco Barisione <marco.barisione@collabora.co.uk> | 2013-05-09 20:44:04 +0800 |
|---|---|---|
| committer | Marco Barisione <marco.barisione@collabora.co.uk> | 2013-08-20 18:03:05 +0800 |
| commit | 406dc1041ff2d0575e43bb0c320a072d29e4af79 (patch) | |
| tree | 2d26b2a781a0c433b4444584c862c3b2f0b5ae72 /tests | |
| parent | 740b695e21016ff7b568b069734b29e780b459e5 (diff) | |
| download | gsoc2013-empathy-406dc1041ff2d0575e43bb0c320a072d29e4af79.tar gsoc2013-empathy-406dc1041ff2d0575e43bb0c320a072d29e4af79.tar.gz gsoc2013-empathy-406dc1041ff2d0575e43bb0c320a072d29e4af79.tar.bz2 gsoc2013-empathy-406dc1041ff2d0575e43bb0c320a072d29e4af79.tar.lz gsoc2013-empathy-406dc1041ff2d0575e43bb0c320a072d29e4af79.tar.xz gsoc2013-empathy-406dc1041ff2d0575e43bb0c320a072d29e4af79.tar.zst gsoc2013-empathy-406dc1041ff2d0575e43bb0c320a072d29e4af79.zip | |
live-search: move from Empathy to tp-account-widgets
https://bugzilla.gnome.org/show_bug.cgi?id=699492
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/empathy-live-search-test.c | 4 | ||||
| -rw-r--r-- | tests/interactive/Makefile.am | 1 | ||||
| -rw-r--r-- | tests/interactive/test-empathy-dual-roster-view.c | 4 | ||||
| -rw-r--r-- | tests/interactive/test-empathy-roster-model-aggregator.c | 4 | ||||
| -rw-r--r-- | tests/interactive/test-empathy-roster-view.c | 4 |
5 files changed, 9 insertions, 8 deletions
diff --git a/tests/empathy-live-search-test.c b/tests/empathy-live-search-test.c index 10f0346f3..2fb3e48db 100644 --- a/tests/empathy-live-search-test.c +++ b/tests/empathy-live-search-test.c @@ -3,8 +3,8 @@ #include <stdlib.h> #include <stdio.h> #include <string.h> +#include <tp-account-widgets/tpaw-live-search.h> -#include "empathy-live-search.h" #include "test-helper.h" #define DEBUG_FLAG EMPATHY_DEBUG_TESTS @@ -57,7 +57,7 @@ test_live_search (void) gboolean match; gboolean ok; - match = empathy_live_search_match_string (tests[i].string, tests[i].prefix); + match = tpaw_live_search_match_string (tests[i].string, tests[i].prefix); ok = (match == tests[i].should_match); DEBUG ("'%s' - '%s' %s: %s", tests[i].string, tests[i].prefix, diff --git a/tests/interactive/Makefile.am b/tests/interactive/Makefile.am index 397536b3a..86d8fe1c3 100644 --- a/tests/interactive/Makefile.am +++ b/tests/interactive/Makefile.am @@ -9,6 +9,7 @@ AM_CPPFLAGS = \ $(DISABLE_DEPRECATED) LDADD = \ + $(top_builddir)/tp-account-widgets/libtp-account-widgets.la \ $(top_builddir)/libempathy-gtk/libempathy-gtk.la \ $(top_builddir)/libempathy/libempathy.la \ $(EMPATHY_LIBS) diff --git a/tests/interactive/test-empathy-dual-roster-view.c b/tests/interactive/test-empathy-dual-roster-view.c index 74bb59f17..5d2dfdc55 100644 --- a/tests/interactive/test-empathy-dual-roster-view.c +++ b/tests/interactive/test-empathy-dual-roster-view.c @@ -93,9 +93,9 @@ create_view_box (EmpathyRosterModel *model, empathy_roster_view_show_offline (EMPATHY_ROSTER_VIEW (view), show_offline); empathy_roster_view_show_groups (EMPATHY_ROSTER_VIEW (view), show_groups); - search = empathy_live_search_new (view); + search = tpaw_live_search_new (view); empathy_roster_view_set_live_search (EMPATHY_ROSTER_VIEW (view), - EMPATHY_LIVE_SEARCH (search)); + TPAW_LIVE_SEARCH (search)); scrolled = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), diff --git a/tests/interactive/test-empathy-roster-model-aggregator.c b/tests/interactive/test-empathy-roster-model-aggregator.c index 478b4e6cc..b55843158 100644 --- a/tests/interactive/test-empathy-roster-model-aggregator.c +++ b/tests/interactive/test-empathy-roster-model-aggregator.c @@ -136,9 +136,9 @@ main (int argc, empathy_roster_view_show_offline (EMPATHY_ROSTER_VIEW (view), show_offline); empathy_roster_view_show_groups (EMPATHY_ROSTER_VIEW (view), show_groups); - search = empathy_live_search_new (view); + search = tpaw_live_search_new (view); empathy_roster_view_set_live_search (EMPATHY_ROSTER_VIEW (view), - EMPATHY_LIVE_SEARCH (search)); + TPAW_LIVE_SEARCH (search)); scrolled = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), diff --git a/tests/interactive/test-empathy-roster-view.c b/tests/interactive/test-empathy-roster-view.c index f814d9658..eb5cf6c6b 100644 --- a/tests/interactive/test-empathy-roster-view.c +++ b/tests/interactive/test-empathy-roster-view.c @@ -128,9 +128,9 @@ main (int argc, g_object_unref (mgr); - search = empathy_live_search_new (view); + search = tpaw_live_search_new (view); empathy_roster_view_set_live_search (EMPATHY_ROSTER_VIEW (view), - EMPATHY_LIVE_SEARCH (search)); + TPAW_LIVE_SEARCH (search)); scrolled = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), |