Prepare for maemo6 stuff

Signed-off-by: Felipe Contreras <[email protected]>
fmunozs · Aug 22, 2011 · 5e9748d · 5e9748d
1 parent 33f42c1
commit 5e9748d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -34,7 +34,7 @@ all:
 libscrobble.a: scrobble.o
 libscrobble.a: override CFLAGS += $(GLIB_CFLAGS) $(SOUP_CFLAGS)
 
-scrobbler: main.o helper.o libscrobble.a service.o
+scrobbler: m5_main.o helper.o libscrobble.a service.o
 scrobbler: override CFLAGS += $(GLIB_CFLAGS) $(GTHREAD_CFLAGS) $(MAFW_CFLAGS) $(CONIC_CFLAGS)
 scrobbler: override LIBS += $(GLIB_LIBS) $(GTHREAD_LIBS) $(MAFW_LIBS) $(CONIC_LIBS) $(SCROBBLE_LIBS) $(DBUS_LIBS)
 bins += scrobbler

diff --git a/helper.c b/helper.c
@@ -220,7 +220,11 @@ void hp_init(void)
 	if (!g_thread_supported())
 		g_thread_init(NULL);
 
+#ifdef MAEMO5
 	conf_file = g_build_filename(g_get_home_dir(), ".osso", "scrobbler", NULL);
+#else
+	conf_file = g_build_filename(g_get_user_config_dir(), "scrobbler", NULL);
+#endif
 	cache_dir = g_build_filename(g_get_user_cache_dir(), "scrobbler", NULL);
 
 	g_mkdir_with_parents(cache_dir, 0755);

diff --git a/main.c → m5_main.c b/main.c → m5_main.c