diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2009-06-25 00:31:53 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2009-06-25 00:31:53 +0800 |
| commit | 309a9214ca400ca0f3bfaacd47ed1e0cd7444220 (patch) | |
| tree | 4de9ddbd5eabf0b895abe02d420e8c3a69961d30 | |
| parent | a7dba74096b4d64e24f3e89aff6616b1e872db34 (diff) | |
| parent | c36efaa152329d5a22e5925bb3fc7f342965228c (diff) | |
| download | gsoc2013-empathy-309a9214ca400ca0f3bfaacd47ed1e0cd7444220.tar gsoc2013-empathy-309a9214ca400ca0f3bfaacd47ed1e0cd7444220.tar.gz gsoc2013-empathy-309a9214ca400ca0f3bfaacd47ed1e0cd7444220.tar.bz2 gsoc2013-empathy-309a9214ca400ca0f3bfaacd47ed1e0cd7444220.tar.lz gsoc2013-empathy-309a9214ca400ca0f3bfaacd47ed1e0cd7444220.tar.xz gsoc2013-empathy-309a9214ca400ca0f3bfaacd47ed1e0cd7444220.tar.zst gsoc2013-empathy-309a9214ca400ca0f3bfaacd47ed1e0cd7444220.zip | |
Merge branch 'check-style'
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/empathy-map-view.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index dbcd6d43d..e2076d3fc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -82,7 +82,7 @@ EXTRA_DIST = \ $(ui_DATA) if HAVE_LIBCHAMPLAIN -empathy_SOURCES += \ +empathy_handwritten_source += \ empathy-map-view.c \ empathy-map-view.h diff --git a/src/empathy-map-view.c b/src/empathy-map-view.c index 99c496b23..86e15bdff 100644 --- a/src/empathy-map-view.c +++ b/src/empathy-map-view.c @@ -161,7 +161,7 @@ map_view_contacts_foreach (GtkTreeModel *model, GtkTreeIter *iter, gpointer user_data) { - EmpathyMapView *window = (EmpathyMapView*) user_data; + EmpathyMapView *window = (EmpathyMapView *) user_data; EmpathyContact *contact; ClutterActor *marker; ClutterActor *texture; |