Index: debian/changelog
===================================================================
--- debian/changelog	(revision 3630)
+++ debian/changelog	(working copy)
@@ -1,3 +1,11 @@
+omweather (0.22.8) unstable; urgency=low
+
+  * Fixed problem with updating weather forecast for more than for 5 stations
+  * Fixed problem with crashing omweather in application mode
+  * Fixed problem with help files
+
+ -- Vlad Vasiliev <vlad@gas.by>  Thu, 29 Jul 2009 21:40:00 +0200
+
 omweather (0.22.6) unstable; urgency=low
 
   * Fixed problem with hours data from weather.com
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 3630)
+++ ChangeLog	(working copy)
@@ -1,3 +1,8 @@
+0.22.8
+  * Fixed problem with updating weather forecast for more than for 5 stations
+  * Fixed problem with crashing omweather in application mode
+  * Fixed problem with help files
+
 0.22.6
   * Fixed problem with hours data from weather.com
   * Fixed problem with autofill field of region
Index: configure.ac
===================================================================
--- configure.ac	(revision 3630)
+++ configure.ac	(working copy)
@@ -225,6 +225,7 @@
         AC_SUBST(LIBOSSOHELP_CFLAGS)
 fi
 
+
 AC_ARG_ENABLE(clutter,
       [  --enable-clutter   Enable GTK-clutter],
       [case "${enableval}" in
Index: data/help/Makefile.am
===================================================================
--- data/help/Makefile.am	(revision 3630)
+++ data/help/Makefile.am	(working copy)
@@ -38,15 +38,9 @@
 	sed "s/__VERSION__/$(VERSION)/g" $< >$@
 
 
-#Remark for work in Fremantle Alpha
-#%.xml.in:
-#	for lang in $(ALL_LINGUAS); do \
-#	    ./intltool-merge4help -x "po/$$lang.po" omweather.xml.in "$$lang/omweather.xml.in" ; \
-#	done
-#Temporary for Fremantle
 %.xml.in:
 	for lang in $(ALL_LINGUAS); do \
-	    cp omweather.xml.in "$$lang/omweather.xml.in" ; \
+	    ./intltool-merge4help -x "po/$$lang.po" omweather.xml.in "$$lang/omweather.xml.in" ; \
 	done
 
 
Index: data/com.nokia.omweather.service
===================================================================
--- data/com.nokia.omweather.service	(revision 3630)
+++ data/com.nokia.omweather.service	(working copy)
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=com.nokia.omweather_app
+Name=org.maemo.omweather
 Exec=/usr/bin/omweather
Index: src/weather-download.c
===================================================================
--- src/weather-download.c	(revision 3630)
+++ src/weather-download.c	(working copy)
@@ -201,9 +201,11 @@
        curl_easy_setopt(my_curl_handle, CURLOPT_TIMEOUT, 30);
     curl_easy_setopt(my_curl_handle, CURLOPT_CONNECTTIMEOUT, 10);
     /* For disabled cache */
-    headers = curl_slist_append(headers, "Cache-Control: no-cache");
-    headers = curl_slist_append(headers, "Pragma: no-cache");
-    curl_easy_setopt(my_curl_handle, CURLOPT_HTTPHEADER, headers);
+    if (!headers){
+      headers = curl_slist_append(headers, "Cache-Control: no-cache");
+      headers = curl_slist_append(headers, "Pragma: no-cache");
+      curl_easy_setopt(my_curl_handle, CURLOPT_HTTPHEADER, headers);
+    }
 
     config_update_proxy();
     /* Set Proxy option */
Index: src/weather-main.c
===================================================================
--- src/weather-main.c	(revision 3630)
+++ src/weather-main.c	(working copy)
@@ -58,7 +58,7 @@
     bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
     textdomain(GETTEXT_PACKAGE);
 #endif
-    osso_context = osso_initialize(PACKAGE, VERSION, TRUE, NULL);
+    osso_context = osso_initialize("org.maemo.omweather", VERSION, TRUE, NULL);
     if(!osso_context){
         fprintf(stderr,"osso_initialize failed\n");
         return 1;
