[Xfce4-commits] xfce4-weather-plugin:master Do not shorten location names returned by auto-detection-by-ip.
Updating branch refs/heads/master
to 9d24c87ebfbbc184701ed5f8bfb12878aa48b5e7 (commit)
from 1b2986a38b904d48fd87285a3001974efc478e8b (commit)
commit 9d24c87ebfbbc184701ed5f8bfb12878aa48b5e7
Author: Harald Judt h.j...@gmx.at
Date: Wed Jul 18 08:18:21 2012 +0200
Do not shorten location names returned by auto-detection-by-ip.
Unlike the search dialog, the auto-detection-by-ip feature returns
a nice location name and there's no need to truncate it.
panel-plugin/weather-config.c |4
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/panel-plugin/weather-config.c b/panel-plugin/weather-config.c
index e2109df..e5a94ce 100644
--- a/panel-plugin/weather-config.c
+++ b/panel-plugin/weather-config.c
@@ -368,15 +368,11 @@ option_i (datas opt)
static void auto_locate_cb(const gchar *loc_name, const gchar *lat, const
gchar *lon, gpointer user_data)
{
xfceweather_dialog *dialog = (xfceweather_dialog *) user_data;
- gchar *sane_loc_name;
if (lat lon loc_name) {
gtk_entry_set_text (GTK_ENTRY (dialog-txt_lat), lat);
gtk_entry_set_text (GTK_ENTRY (dialog-txt_lon), lon);
gtk_entry_set_text (GTK_ENTRY (dialog-txt_loc_name), loc_name);
-sane_loc_name = sanitize_location_name(loc_name);
-gtk_entry_set_text (GTK_ENTRY (dialog-txt_loc_name), sane_loc_name);
-g_free(sane_loc_name);
gtk_widget_set_sensitive(dialog-txt_loc_name, TRUE);
#if GTK_CHECK_VERSION(2,12,0)
gtk_widget_set_tooltip_text(dialog-txt_loc_name,loc_name);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-weather-plugin:master Fix distcheck.
Updating branch refs/heads/master to 9f6a2a3503e7542584b5d351d5b71f7a7f74228a (commit) from 9d24c87ebfbbc184701ed5f8bfb12878aa48b5e7 (commit) commit 9f6a2a3503e7542584b5d351d5b71f7a7f74228a Author: Harald Judt h.j...@gmx.at Date: Wed Jul 18 09:08:15 2012 +0200 Fix distcheck. Remove stale icon cache file. Makefile.am |5 - 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/Makefile.am b/Makefile.am index 294135d..01a484e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,10 +2,13 @@ SUBDIRS = \ panel-plugin\ po \ icons - + distclean-local: rm -rf *.cache *~ +distuninstallcheck_listfiles = \ + find . -type f -print | grep -v ./share/icons/hicolor/icon-theme.cache + rpm: dist rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz @rm -f $(PACKAGE)-$(VERSION).tar.gz ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-weather-plugin:master Fix configure.ac.in as suggested in bug #6920.
Updating branch refs/heads/master to 2b202977830b2c61e5cfa34768ae88fb9c02fb6b (commit) from 9f6a2a3503e7542584b5d351d5b71f7a7f74228a (commit) commit 2b202977830b2c61e5cfa34768ae88fb9c02fb6b Author: Harald Judt h.j...@gmx.at Date: Wed Jul 18 09:09:09 2012 +0200 Fix configure.ac.in as suggested in bug #6920. Bump autogen, automake and libtool versions. configure.ac.in |7 --- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index d1bb58e..786a137 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -21,12 +21,12 @@ dnl *** AC_COPYRIGHT([Copyright (c) 2006-2007 The Xfce development team. All rights reserved.]) AC_INIT([xfce4-weather-plugin], [weather_version], [http://bugzilla.xfce.org/], [xfce4-weather-plugin]) -AC_PREREQ([2.50]) +AC_PREREQ([2.60]) dnl *** dnl *** Initialize automake *** dnl *** -AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar]) +AM_INIT_AUTOMAKE([1.9 dist-bzip2 tar-ustar]) AM_CONFIG_HEADER([config.h]) AM_MAINTAINER_MODE() @@ -37,7 +37,8 @@ AC_PROG_CC() AC_PROG_LD() AC_PROG_INSTALL() AC_PROG_INTLTOOL() -AC_PROG_LIBTOOL() +LT_PREREQ([2.2.6]) +LT_INIT([disable-static]) AM_PROG_CC_C_O() dnl ** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] archive:master Remove geolocation code.
Updating branch refs/heads/master
to 6da865cfff5d976368e9811dd25f5afab10e450d (commit)
from 091acfa8ebe042399c5fc7046c22fe8b6ccdaf5a (commit)
commit 6da865cfff5d976368e9811dd25f5afab10e450d
Author: Nick Schermer n...@xfce.org
Date: Wed Jul 18 11:16:16 2012 +0200
Remove geolocation code.
fancyindex/main.rb|6 --
fancyindex/views/geolocation.haml | 19 ---
2 files changed, 0 insertions(+), 25 deletions(-)
diff --git a/fancyindex/main.rb b/fancyindex/main.rb
index 47535eb..f619621 100644
--- a/fancyindex/main.rb
+++ b/fancyindex/main.rb
@@ -8,12 +8,6 @@ module Fancyindex
class Application Sinatra::Base
include Fancyindex::Models
-# used in the xfce weather plugin
-get '/geolocation' do
- content_type 'application/xml', :charset = 'utf-8'
- haml :geolocation, :layout = false
-end
-
get '/howtomirror' do
@title = How to become a mirror for Xfce
@minute = rand(59)
diff --git a/fancyindex/views/geolocation.haml
b/fancyindex/views/geolocation.haml
deleted file mode 100644
index f35de29..000
--- a/fancyindex/views/geolocation.haml
+++ /dev/null
@@ -1,19 +0,0 @@
-%Response
- - if ENV['GEOIP_ADDR']
-%Ip #{ENV['GEOIP_ADDR']}
- - if ENV['GEOIP_COUNTRY_CODE']
-%CountryCode #{ENV['GEOIP_COUNTRY_CODE']}
- - if ENV['GEOIP_COUNTRY_NAME']
-%CountryName #{ENV['GEOIP_COUNTRY_NAME']}
- - if ENV['GEOIP_REGION']
-%RegionCode #{ENV['GEOIP_REGION']}
- - if ENV['GEOIP_REGION_NAME']
-%RegionName #{ENV['GEOIP_REGION_NAME']}
- - if ENV['GEOIP_AREA_CODE']
-%RegionName #{ENV['GEOIP_AREA_CODE']}
- - if ENV['GEOIP_CITY']
-%City #{ENV['GEOIP_CITY']}
- - if ENV['GEOIP_LATITUDE']
-%Latitude #{ENV['GEOIP_LATITUDE']}
- - if ENV['GEOIP_LONGITUDE']
-%Longitude #{ENV['GEOIP_LONGITUDE']}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-weather-plugin:master Clean up the clouds/cloudiness confusion.
Updating branch refs/heads/master
to 359bb2cde74fd0579924379efcb5c1ee09fb838e (commit)
from 2b202977830b2c61e5cfa34768ae88fb9c02fb6b (commit)
commit 359bb2cde74fd0579924379efcb5c1ee09fb838e
Author: Harald Judt h.j...@gmx.at
Date: Wed Jul 18 10:49:41 2012 +0200
Clean up the clouds/cloudiness confusion.
Do not mix up the terms low/medium/high clouds with cloudiness,
even if they are given in percent ;-)
panel-plugin/weather-config.c |8
panel-plugin/weather-data.c| 28 ++--
panel-plugin/weather-data.h|8
panel-plugin/weather-parsers.c | 22 +++---
panel-plugin/weather-parsers.h | 12 ++--
panel-plugin/weather-summary.c |8
panel-plugin/weather.c |8
7 files changed, 47 insertions(+), 47 deletions(-)
diff --git a/panel-plugin/weather-config.c b/panel-plugin/weather-config.c
index e5a94ce..e0974a9 100644
--- a/panel-plugin/weather-config.c
+++ b/panel-plugin/weather-config.c
@@ -42,10 +42,10 @@ static const labeloption labeloptions[OPTIONS_N] = {
{N_(Wind direction (WD)), WIND_DIRECTION},
{N_(Wind direction in degrees (WD)), WIND_DIRECTION_DEG},
{N_(Humidity (H)), HUMIDITY},
- {N_(Low cloudiness (CL)), CLOUDINESS_LOW},
- {N_(Medium cloudiness (CM)), CLOUDINESS_MED},
- {N_(High cloudiness (CH)), CLOUDINESS_HIGH},
- {N_(Overall cloudiness (C)), CLOUDINESS_OVERALL},
+ {N_(Low clouds (CL)), CLOUDS_LOW},
+ {N_(Medium clouds (CM)), CLOUDS_MED},
+ {N_(High clouds (CH)), CLOUDS_HIGH},
+ {N_(Cloudiness (C)), CLOUDINESS},
{N_(Fog (F)), FOG},
{N_(Precipitations (R)), PRECIPITATIONS},
};
diff --git a/panel-plugin/weather-data.c b/panel-plugin/weather-data.c
index f26d56a..c029ea7 100644
--- a/panel-plugin/weather-data.c
+++ b/panel-plugin/weather-data.c
@@ -93,14 +93,14 @@ get_data (xml_time *timeslice, unit_systems unit_system,
datas type)
return LOCALE_DOUBLE(loc-wind_dir_deg, %.1f);
case HUMIDITY:
return LOCALE_DOUBLE(loc-humidity_value, %.1f);
- case CLOUDINESS_LOW:
- return LOCALE_DOUBLE(loc-cloudiness_percent[CLOUD_LOW],
%.1f);
- case CLOUDINESS_MED:
- return LOCALE_DOUBLE(loc-cloudiness_percent[CLOUD_MED],
%.1f);
- case CLOUDINESS_HIGH:
- return LOCALE_DOUBLE(loc-cloudiness_percent[CLOUD_HIGH],
%.1f);
- case CLOUDINESS_OVERALL:
- return LOCALE_DOUBLE(loc-cloudiness_percent[CLOUD_OVERALL],
%.1f);
+ case CLOUDS_LOW:
+ return LOCALE_DOUBLE(loc-clouds_percent[CLOUDS_PERC_LOW],
%.1f);
+ case CLOUDS_MED:
+ return LOCALE_DOUBLE(loc-clouds_percent[CLOUDS_PERC_MED],
%.1f);
+ case CLOUDS_HIGH:
+ return LOCALE_DOUBLE(loc-clouds_percent[CLOUDS_PERC_HIGH],
%.1f);
+ case CLOUDINESS:
+ return
LOCALE_DOUBLE(loc-clouds_percent[CLOUDS_PERC_CLOUDINESS], %.1f);
case FOG:
return LOCALE_DOUBLE(loc-fog_percent, %.1f);
case PRECIPITATIONS:
@@ -140,10 +140,10 @@ get_unit (xml_time *timeslice, unit_systems unit_system,
datas type)
case LONGITUDE:
return °;
case HUMIDITY:
- case CLOUDINESS_LOW:
- case CLOUDINESS_MED:
- case CLOUDINESS_HIGH:
- case CLOUDINESS_OVERALL:
+ case CLOUDS_LOW:
+ case CLOUDS_MED:
+ case CLOUDS_HIGH:
+ case CLOUDINESS:
case FOG:
return %;
case PRECIPITATIONS:
@@ -375,8 +375,8 @@ make_combined_timeslice(xml_time *point, xml_time *interval)
loc-pressure_value = g_strdup(point-location-pressure_value);
loc-pressure_unit = g_strdup(point-location-pressure_unit);
-for (i = 0; i NUM_CLOUDINESS; i++)
-loc-cloudiness_percent[i] =
g_strdup(point-location-cloudiness_percent[i]);
+for (i = 0; i CLOUDS_PERC_NUM; i++)
+loc-clouds_percent[i] = g_strdup(point-location-clouds_percent[i]);
loc-fog_percent = g_strdup(point-location-fog_percent);
diff --git a/panel-plugin/weather-data.h b/panel-plugin/weather-data.h
index d443458..a7b6911 100644
--- a/panel-plugin/weather-data.h
+++ b/panel-plugin/weather-data.h
@@ -31,10 +31,10 @@ typedef enum {
WIND_DIRECTION,
WIND_DIRECTION_DEG,
HUMIDITY,
- CLOUDINESS_LOW,
- CLOUDINESS_MED,
- CLOUDINESS_HIGH,
- CLOUDINESS_OVERALL,
+ CLOUDS_LOW,
+ CLOUDS_MED,
+ CLOUDS_HIGH,
+ CLOUDINESS,
FOG,
PRECIPITATIONS,
SYMBOL
diff --git a/panel-plugin/weather-parsers.c b/panel-plugin/weather-parsers.c
index a3c9911..472f3b6 100644
--- a/panel-plugin/weather-parsers.c
+++ b/panel-plugin/weather-parsers.c
@@ -208,24 +208,24 @@ void parse_location (xmlNode * cur_node, xml_location
*loc)
loc-pressure_value = PROP(child_node, value);
}
if (NODE_IS_TYPE (child_node, cloudiness)) {
-
[Xfce4-commits] xfce4-weather-plugin:master Free more data in xml_location_free().
Updating branch refs/heads/master
to 9c99174c8d5458465c072ed7ba5b833d387d0cba (commit)
from 359bb2cde74fd0579924379efcb5c1ee09fb838e (commit)
commit 9c99174c8d5458465c072ed7ba5b833d387d0cba
Author: Harald Judt h.j...@gmx.at
Date: Wed Jul 18 11:06:09 2012 +0200
Free more data in xml_location_free().
This should fix a bunch of memory leaks.
panel-plugin/weather-parsers.c | 14 +-
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/panel-plugin/weather-parsers.c b/panel-plugin/weather-parsers.c
index 472f3b6..fd3f463 100644
--- a/panel-plugin/weather-parsers.c
+++ b/panel-plugin/weather-parsers.c
@@ -243,22 +243,26 @@ void parse_location (xmlNode * cur_node, xml_location
*loc)
static void xml_location_free(xml_location *loc)
{
- g_free(loc-temperature_unit);
+ g_free(loc-altitude);
+ g_free(loc-latitude);
+ g_free(loc-longitude);
g_free(loc-temperature_value);
+ g_free(loc-temperature_unit);
g_free(loc-wind_dir_deg);
g_free(loc-wind_dir_name);
g_free(loc-wind_speed_mps);
g_free(loc-wind_speed_beaufort);
- g_free(loc-humidity_unit);
g_free(loc-humidity_value);
- g_free(loc-pressure_unit);
+ g_free(loc-humidity_unit);
g_free(loc-pressure_value);
- g_free(loc-fog_percent);
+ g_free(loc-pressure_unit);
g_free(loc-clouds_percent[CLOUDS_PERC_LOW]);
g_free(loc-clouds_percent[CLOUDS_PERC_MED]);
g_free(loc-clouds_percent[CLOUDS_PERC_HIGH]);
- g_free(loc-precipitation_unit);
+ g_free(loc-clouds_percent[CLOUDS_PERC_CLOUDINESS]);
+ g_free(loc-fog_percent);
g_free(loc-precipitation_value);
+ g_free(loc-precipitation_unit);
g_free(loc-symbol);
g_slice_free (xml_location, loc);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-weather-plugin:master Fix check for missing latitude or longitude.
Updating branch refs/heads/master
to 59801b00e373b4e383711cd886e2e199b8d833bb (commit)
from 1bb5cc97419fa119bb271456815bf8cfac769116 (commit)
commit 59801b00e373b4e383711cd886e2e199b8d833bb
Author: Harald Judt h.j...@gmx.at
Date: Wed Jul 18 11:59:42 2012 +0200
Fix check for missing latitude or longitude.
panel-plugin/weather.c |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/panel-plugin/weather.c b/panel-plugin/weather.c
index 3d0ec42..a2c4f4e 100644
--- a/panel-plugin/weather.c
+++ b/panel-plugin/weather.c
@@ -439,7 +439,8 @@ static gboolean
update_weatherdata (xfceweather_data *data)
{
gchar *url;
- if (!data-lat || !data-lon)
+ if ((!data-lat || !data-lon)
+ || strlen(data-lat) == 0 || strlen(data-lon) == 0)
{
gtk_scrollbox_clear (GTK_SCROLLBOX (data-scrollbox));
set_icon_error (data);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-weather-plugin:master Initialize xfceweather_data with sane values.
Updating branch refs/heads/master to 60881be1b2bb12fbcafb3c2d09e03baeee6a6596 (commit) from 59801b00e373b4e383711cd886e2e199b8d833bb (commit) commit 60881be1b2bb12fbcafb3c2d09e03baeee6a6596 Author: Harald Judt h.j...@gmx.at Date: Wed Jul 18 12:00:47 2012 +0200 Initialize xfceweather_data with sane values. panel-plugin/weather.c | 16 ++-- panel-plugin/weather.h |1 + 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/panel-plugin/weather.c b/panel-plugin/weather.c index a2c4f4e..ec20d9c 100644 --- a/panel-plugin/weather.c +++ b/panel-plugin/weather.c @@ -599,8 +599,8 @@ xfceweather_read_config (XfcePanelPlugin *plugin, data-proxy_port = data-saved_proxy_port; } - val = xfce_rc_read_int_entry (rc, forecast_days, 5); - data-forecast_days = (val 0 val = MAX_FORECAST_DAYS) ? val : 5; + val = xfce_rc_read_int_entry (rc, forecast_days, DEFAULT_FORECAST_DAYS); + data-forecast_days = (val 0 val = MAX_FORECAST_DAYS) ? val : DEFAULT_FORECAST_DAYS; data-animation_transitions = xfce_rc_read_bool_entry (rc, animation_transitions, TRUE); @@ -898,7 +898,19 @@ xfceweather_create_control (XfcePanelPlugin *plugin) datas lbl; GdkPixbuf*icon = NULL; + /* Initialize with sane default values */ data-plugin = plugin; + data-lat = NULL; + data-lon = NULL; + data-location_name = NULL; + data-unit_system = METRIC; + data-weatherdata = NULL; + data-proxy_host = NULL; + data-proxy_port = 0; + data-saved_proxy_host = NULL; + data-saved_proxy_port = 0; + data-animation_transitions = FALSE; + data-forecast_days = DEFAULT_FORECAST_DAYS; #if !GTK_CHECK_VERSION(2,12,0) data-tooltips = gtk_tooltips_new (); diff --git a/panel-plugin/weather.h b/panel-plugin/weather.h index 557509e..4a6a09a 100644 --- a/panel-plugin/weather.h +++ b/panel-plugin/weather.h @@ -22,6 +22,7 @@ #include libxfce4util/libxfce4util.h #define PLUGIN_WEBSITE http://goodies.xfce.org/projects/panel-plugins/xfce4-weather-plugin; #define MAX_FORECAST_DAYS 10 +#define DEFAULT_FORECAST_DAYS 5 G_BEGIN_DECLS ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-weather-plugin:master Free saved_proxy_host.
Updating branch refs/heads/master to 40e64e797dc722e4f971f24f08209ef702e6d93e (commit) from 60881be1b2bb12fbcafb3c2d09e03baeee6a6596 (commit) commit 40e64e797dc722e4f971f24f08209ef702e6d93e Author: Harald Judt h.j...@gmx.at Date: Wed Jul 18 12:04:30 2012 +0200 Free saved_proxy_host. panel-plugin/weather.c |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/panel-plugin/weather.c b/panel-plugin/weather.c index ec20d9c..c95cccb 100644 --- a/panel-plugin/weather.c +++ b/panel-plugin/weather.c @@ -1029,6 +1029,7 @@ xfceweather_free (XfcePanelPlugin *plugin, g_free (data-lon); g_free (data-location_name); g_free (data-proxy_host); + g_free (data-saved_proxy_host); /* Free Array */ g_array_free (data-labels, TRUE); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-weather-plugin:master Do not activate location name widget without latitude and longitude set.
Updating branch refs/heads/master to 494ddf8643f1627354be3088b1f14b5176476307 (commit) from 40e64e797dc722e4f971f24f08209ef702e6d93e (commit) commit 494ddf8643f1627354be3088b1f14b5176476307 Author: Harald Judt h.j...@gmx.at Date: Wed Jul 18 13:05:41 2012 +0200 Do not activate location name widget without latitude and longitude set. Because longitude and latitude are not shown anywhere in the config dialog, the user might think it is enough to type in some text and everything will work. So only activate the text box when latitude and longitude are known, otherwise keep it disabled. panel-plugin/weather-config.c | 11 --- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/panel-plugin/weather-config.c b/panel-plugin/weather-config.c index e0974a9..8725e9e 100644 --- a/panel-plugin/weather-config.c +++ b/panel-plugin/weather-config.c @@ -381,7 +381,7 @@ static void auto_locate_cb(const gchar *loc_name, const gchar *lat, const gchar gtk_entry_set_text (GTK_ENTRY (dialog-txt_lat), ); gtk_entry_set_text (GTK_ENTRY (dialog-txt_lon), ); gtk_entry_set_text (GTK_ENTRY (dialog-txt_loc_name), _(Unset)); -gtk_widget_set_sensitive(dialog-txt_loc_name, TRUE); +gtk_widget_set_sensitive(dialog-txt_loc_name, FALSE); } } @@ -474,12 +474,17 @@ create_config_dialog (xfceweather_data *data, gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); gtk_label_set_mnemonic_widget (GTK_LABEL (label), GTK_WIDGET (dialog-txt_loc_name)); - if (dialog-wd-lat != NULL) + if (dialog-wd-lat != NULL strlen(dialog-wd-lat) 0) gtk_entry_set_text (GTK_ENTRY (dialog-txt_lat), dialog-wd-lat); - if (dialog-wd-lon != NULL) + else +gtk_widget_set_sensitive(dialog-txt_loc_name, FALSE); + + if (dialog-wd-lon != NULL strlen(dialog-wd-lon) 0) gtk_entry_set_text (GTK_ENTRY (dialog-txt_lon), dialog-wd-lon); + else +gtk_widget_set_sensitive(dialog-txt_loc_name, FALSE); if (dialog-wd-location_name != NULL) gtk_entry_set_text (GTK_ENTRY (dialog-txt_loc_name), ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-weather-plugin:master Always try to detect location by IP when lat/lon unset.
Updating branch refs/heads/master
to e892eb2008ab68c2feaf8583bdffcf42ebe64e06 (commit)
from 494ddf8643f1627354be3088b1f14b5176476307 (commit)
commit e892eb2008ab68c2feaf8583bdffcf42ebe64e06
Author: Harald Judt h.j...@gmx.at
Date: Wed Jul 18 13:20:28 2012 +0200
Always try to detect location by IP when lat/lon unset.
Also need to check for empty strings here.
panel-plugin/weather-config.c |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/panel-plugin/weather-config.c b/panel-plugin/weather-config.c
index 8725e9e..fdc576e 100644
--- a/panel-plugin/weather-config.c
+++ b/panel-plugin/weather-config.c
@@ -498,7 +498,8 @@ create_config_dialog (xfceweather_data *data,
gtk_entry_get_text (GTK_ENTRY
(dialog-txt_loc_name)));
#endif
- if (dialog-wd-lat == NULL || dialog-wd-lon == NULL) {
+ if ((dialog-wd-lat == NULL || dialog-wd-lon == NULL)
+ || (! strlen(dialog-wd-lat) || ! strlen(dialog-wd-lon))) {
start_auto_locate(dialog);
}
gtk_size_group_add_widget (sg, label);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-weather-plugin:master Make auto-detection by IP address work again.
Updating branch refs/heads/master to a2a6e2a54370e8d01bca5c502f1d85263c28b897 (commit) from e892eb2008ab68c2feaf8583bdffcf42ebe64e06 (commit) commit a2a6e2a54370e8d01bca5c502f1d85263c28b897 Author: Harald Judt h.j...@gmx.at Date: Wed Jul 18 14:33:14 2012 +0200 Make auto-detection by IP address work again. Nick installed a new GeoIP service at geoip.xfce.org. Because the new server uses chunked HTTP and I don't feel like implementing a decode routine for it, let's make a special request only for GeoIP that uses HTTP/1.0 instead of HTTP/1.1. panel-plugin/weather-http.c | 12 +++- panel-plugin/weather-search.c |4 +--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/panel-plugin/weather-http.c b/panel-plugin/weather-http.c index 1834343..7caa1cf 100644 --- a/panel-plugin/weather-http.c +++ b/panel-plugin/weather-http.c @@ -267,11 +267,13 @@ weather_http_receive_data_idle (gpointer user_data) if (connection-proxy_host) request = g_strdup_printf (GET http://%s%s HTTP/1.0\r\n\r\n, connection-hostname, connection-url); else -request = g_strdup_printf (GET %s HTTP/1.1\r\n - Host: %s\r\n - Connection: close\r\n - \r\n, - connection-url, connection-hostname); +request = g_strdup_printf (GET %s HTTP/1.%d\r\n + Host: %s\r\n + Connection: close\r\n + \r\n, + connection-url, + strcmp(connection-hostname, geoip.xfce.org) ? 1 : 0, + connection-hostname); /* send the request */ for (m = 0, n = strlen (request); m n;) diff --git a/panel-plugin/weather-search.c b/panel-plugin/weather-search.c index 68f84a9..815e62e 100644 --- a/panel-plugin/weather-search.c +++ b/panel-plugin/weather-search.c @@ -550,9 +550,7 @@ void weather_search_by_ip( data-proxy_host = proxy_host; data-proxy_port = proxy_port; - /* archive.xfce.org is our download server that runs mod_geoip - * with the www.maxmind.com database */ - weather_http_receive_data (archive.xfce.org, /geolocation, + weather_http_receive_data (geoip.xfce.org, /, proxy_host, proxy_port, cb_geolocation, data); return; ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-weather-plugin:master Update comments about geoip.xfce.org.
Updating branch refs/heads/master
to c97abf006bcc6e641faedf208ee11b23177a0bc4 (commit)
from a2a6e2a54370e8d01bca5c502f1d85263c28b897 (commit)
commit c97abf006bcc6e641faedf208ee11b23177a0bc4
Author: Harald Judt h.j...@gmx.at
Date: Wed Jul 18 14:59:45 2012 +0200
Update comments about geoip.xfce.org.
panel-plugin/weather-http.c |2 +-
panel-plugin/weather-search.c |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/panel-plugin/weather-http.c b/panel-plugin/weather-http.c
index 7caa1cf..0c6b540 100644
--- a/panel-plugin/weather-http.c
+++ b/panel-plugin/weather-http.c
@@ -382,7 +382,7 @@ weather_http_receive_data_idle (gpointer user_data)
}
else
{
- /* hack for archive.xfce.org, which return no content-length */
+ /* hack for geoip.xfce.org, which return no content-length */
p = strstr ((char *)connection-received, Response);
if (G_LIKELY (p))
cts_len = connection-received_len - (p - connection-received);
diff --git a/panel-plugin/weather-search.c b/panel-plugin/weather-search.c
index 815e62e..e59d056 100644
--- a/panel-plugin/weather-search.c
+++ b/panel-plugin/weather-search.c
@@ -442,7 +442,7 @@ cb_geolocation (gboolean succeed,
return;
}
- /* hack for archive.xfce.org, which return no content-length */
+ /* hack for geoip.xfce.org, which return no content-length */
p = strstr (received, /Response);
if (p != NULL)
length = p - received + strlen (/Response);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-weather-plugin:master GeoIP: Do not use another search query for lat and lon.
Updating branch refs/heads/master
to 03ae60b9e13c8c17c59f885211799349e4d55583 (commit)
from c97abf006bcc6e641faedf208ee11b23177a0bc4 (commit)
commit 03ae60b9e13c8c17c59f885211799349e4d55583
Author: Harald Judt h.j...@gmx.at
Date: Wed Jul 18 16:02:13 2012 +0200
GeoIP: Do not use another search query for lat and lon.
For some reason, the city name returned by GeoIP is fed back
into the search service to determine latitude and longitude.
However, GeoIP data already contains that information, so we
don't need to start another search query and can use that
directly.
What's more, the GeoIP service in most cases returns a
better location name than that provided by openstreetmap,
which is usually much too long and needs to be truncated.
panel-plugin/weather-search.c | 108 +++-
1 files changed, 19 insertions(+), 89 deletions(-)
diff --git a/panel-plugin/weather-search.c b/panel-plugin/weather-search.c
index e59d056..83df627 100644
--- a/panel-plugin/weather-search.c
+++ b/panel-plugin/weather-search.c
@@ -351,80 +351,11 @@ typedef struct {
}
geolocation_data;
-static void
-cb_geo_searchdone (gboolean succeed,
- gchar*received,
- size_tlen,
- gpointer user_data)
-{
- geolocation_data *data = (geolocation_data *) user_data;
- xmlDoc*doc;
- xmlNode *cur_node;
- gchar *lat, *lon, *city;
-
- if (!succeed || received == NULL) {
-data-cb(NULL, NULL, NULL, data-user_data);
-g_free(data);
-return;
- }
-
- if (g_utf8_validate(received, -1, NULL)) {
-/* force parsing as UTF-8, the XML encoding header may lie */
-doc = xmlReadMemory (received, strlen (received), NULL, UTF-8, 0);
- } else {
-doc = xmlParseMemory (received, strlen(received));
- }
- g_free (received);
-
- if (!doc) {
-data-cb(NULL, NULL, NULL, data-user_data);
-g_free(data);
-return;
- }
-
- cur_node = xmlDocGetRootElement (doc);
-
- if (cur_node)
-{
- for (cur_node = cur_node-children; cur_node; cur_node = cur_node-next)
-{
- if (NODE_IS_TYPE (cur_node, place))
-{
- lat = (gchar *) xmlGetProp (cur_node, (const xmlChar *) lat);
- if (!lat)
- continue;
- lon = (gchar *) xmlGetProp (cur_node, (const xmlChar *) lon);
- if (!lon) {
- g_free(lat);
- continue;
- }
-
- city = (gchar *) xmlGetProp (cur_node, (const xmlChar *)
display_name);
-
- if (!city)
-{
- g_free(lat);
- g_free(lon);
- continue;
-}
-
- data-cb(city, lat, lon, data-user_data);
- g_free (lat);
- g_free (lon);
- g_free (city);
- break;
-}
-}
-}
-
- g_free(data);
- xmlFreeDoc (doc);
-}
static void
cb_geolocation (gboolean succeed,
gchar*received,
- size_tlen,
+size_tlen,
gpointer user_data)
{
geolocation_data *data = (geolocation_data *) user_data;
@@ -432,6 +363,7 @@ cb_geolocation (gboolean succeed,
xmlNode *cur_node;
gchar *city = NULL, *country = NULL;
gchar *country_code = NULL, *region = NULL;
+ gchar *latitude = NULL, *longitude = NULL;
gchar *full_loc;
gsize length;
gchar *p;
@@ -485,6 +417,14 @@ cb_geolocation (gboolean succeed,
{
region = DATA (cur_node);
}
+ if (NODE_IS_TYPE (cur_node, Latitude))
+{
+ latitude = DATA (cur_node);
+}
+ if (NODE_IS_TYPE (cur_node, Longitude))
+{
+ longitude = DATA (cur_node);
+}
}
}
@@ -499,6 +439,10 @@ cb_geolocation (gboolean succeed,
{
full_loc = g_strdup (country);
}
+ else if (latitude longitude)
+{
+ full_loc = g_strdup (_(Untitled));
+}
else
{
full_loc = NULL;
@@ -511,25 +455,11 @@ cb_geolocation (gboolean succeed,
xmlFreeDoc (doc);
- if (full_loc) {
- gchar *url, *sane_str;
-
- if ((sane_str = sanitize_str (full_loc)) == NULL) {
- data-cb(NULL, NULL, NULL, data-user_data);
- g_free(data);
- g_free(full_loc);
- return;
- }
- g_free(full_loc);
-
- url = g_strdup_printf (/search?q=%sformat=xml, sane_str);
- g_free (sane_str);
-
- weather_http_receive_data (nominatim.openstreetmap.org, url,
- data-proxy_host, data-proxy_port,
- cb_geo_searchdone, data);
- g_free(url);
- }
+ data-cb(full_loc, latitude, longitude, data-user_data);
+ g_free (latitude);
+ g_free (longitude);
+ g_free (full_loc);
+ g_free (data);
}
[Xfce4-commits] xfce4-weather-plugin:master GeoIP: Try to automatically determine system of measurement.
Updating branch refs/heads/master
to a4657c4aa3077fe158413d03db68cc577935279d (commit)
from 03ae60b9e13c8c17c59f885211799349e4d55583 (commit)
commit a4657c4aa3077fe158413d03db68cc577935279d
Author: Harald Judt h.j...@gmx.at
Date: Wed Jul 18 17:00:48 2012 +0200
GeoIP: Try to automatically determine system of measurement.
Using the country code and a list of countries _officially_ using the
imperial system to set the system of measurement automatically.
Default to metric if no country code has been found or if the country
is not in the list.
panel-plugin/weather-config.c |3 +-
panel-plugin/weather-search.c | 45 +---
panel-plugin/weather-search.h |5 ++-
3 files changed, 42 insertions(+), 11 deletions(-)
diff --git a/panel-plugin/weather-config.c b/panel-plugin/weather-config.c
index fdc576e..e196ebf 100644
--- a/panel-plugin/weather-config.c
+++ b/panel-plugin/weather-config.c
@@ -365,7 +365,7 @@ option_i (datas opt)
return -1;
}
-static void auto_locate_cb(const gchar *loc_name, const gchar *lat, const
gchar *lon, gpointer user_data)
+static void auto_locate_cb(const gchar *loc_name, const gchar *lat, const
gchar *lon, unit_systems unit_system, gpointer user_data)
{
xfceweather_dialog *dialog = (xfceweather_dialog *) user_data;
@@ -383,6 +383,7 @@ static void auto_locate_cb(const gchar *loc_name, const
gchar *lat, const gchar
gtk_entry_set_text (GTK_ENTRY (dialog-txt_loc_name), _(Unset));
gtk_widget_set_sensitive(dialog-txt_loc_name, FALSE);
}
+ gtk_combo_box_set_active (GTK_COMBO_BOX (dialog-combo_unit_system),
unit_system);
}
static void start_auto_locate(xfceweather_dialog *dialog)
diff --git a/panel-plugin/weather-search.c b/panel-plugin/weather-search.c
index 83df627..ecf59d9 100644
--- a/panel-plugin/weather-search.c
+++ b/panel-plugin/weather-search.c
@@ -343,15 +343,38 @@ free_search_dialog (search_dialog * dialog)
g_slice_free (search_dialog, dialog);
}
+
+
typedef struct {
const gchar *proxy_host;
gint proxy_port;
- void (*cb)(const gchar *loc_name, const gchar *lat, const gchar *lon,
gpointer user_data);
+ void (*cb)(const gchar *loc_name, const gchar *lat, const gchar *lon,
+ const unit_systems unit_system, gpointer user_data);
gpointer user_data;
}
geolocation_data;
+
+static unit_systems
+get_preferred_unit_system (const gchar *country_code)
+{
+ /* List gathered from http://www.maxmind.com/app/iso3166 */
+ if (country_code == NULL)
+return METRIC;
+ else if (!strcmp (country_code, US)) /* United States */
+return IMPERIAL;
+ else if (!strcmp (country_code, GB)) /* United Kingdom */
+return IMPERIAL;
+ else if (!strcmp (country_code, LR)) /* Liberia */
+return IMPERIAL;
+ else if (!strcmp (country_code, MM)) /* Myanmar (Burma) */
+return IMPERIAL;
+ return METRIC;
+}
+
+
+
static void
cb_geolocation (gboolean succeed,
gchar*received,
@@ -365,11 +388,12 @@ cb_geolocation (gboolean succeed,
gchar *country_code = NULL, *region = NULL;
gchar *latitude = NULL, *longitude = NULL;
gchar *full_loc;
+ unit_systems unit_system;
gsize length;
gchar *p;
if (!succeed || received == NULL) {
-data-cb(NULL, NULL, NULL, data-user_data);
+data-cb(NULL, NULL, NULL, METRIC, data-user_data);
g_free(data);
return;
}
@@ -390,7 +414,7 @@ cb_geolocation (gboolean succeed,
g_free (received);
if (!doc) {
-data-cb(NULL, NULL, NULL, data-user_data);
+data-cb(NULL, NULL, NULL, METRIC, data-user_data);
g_free(data);
return;
}
@@ -448,6 +472,8 @@ cb_geolocation (gboolean succeed,
full_loc = NULL;
}
+ unit_system = get_preferred_unit_system(country_code);
+
g_free (country_code);
g_free (region);
g_free (country);
@@ -455,7 +481,7 @@ cb_geolocation (gboolean succeed,
xmlFreeDoc (doc);
- data-cb(full_loc, latitude, longitude, data-user_data);
+ data-cb(full_loc, latitude, longitude, unit_system, data-user_data);
g_free (latitude);
g_free (longitude);
g_free (full_loc);
@@ -464,10 +490,13 @@ cb_geolocation (gboolean succeed,
-void weather_search_by_ip(
- const gchar *proxy_host, gint proxy_port,
-void (*gui_cb)(const gchar *loc_name, const gchar *lat, const gchar
*lon, gpointer user_data),
- gpointer user_data)
+void weather_search_by_ip(const gchar *proxy_host, gint proxy_port,
+ void (*gui_cb)(const gchar *loc_name,
+ const gchar *lat,
+ const gchar *lon,
+ const unit_systems unit_system,
+ gpointer user_data),
+ gpointer user_data)
{
geolocation_data *data;
diff --git a/panel-plugin/weather-search.h
[Xfce4-commits] xfce4-weather-plugin:master l10n: Updated Croatian (hr) translation to 54%
Updating branch refs/heads/master to d8af92353deaf1da4bc7163caffa42fea2b7ae59 (commit) from a4657c4aa3077fe158413d03db68cc577935279d (commit) commit d8af92353deaf1da4bc7163caffa42fea2b7ae59 Author: Ivica Kolić ik...@yahoo.com Date: Wed Jul 18 17:24:20 2012 +0200 l10n: Updated Croatian (hr) translation to 54% New status: 84 messages complete with 0 fuzzies and 71 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/hr.po | 31 --- 1 files changed, 12 insertions(+), 19 deletions(-) diff --git a/po/hr.po b/po/hr.po index 2cdb842..4b41d3b 100644 --- a/po/hr.po +++ b/po/hr.po @@ -2,7 +2,7 @@ # Copyright (C) 2006-2007 The Xfce development team. # This file is distributed under the same license as the xfce4-weather-plugin package. # Ivica Kolić ik...@yahoo.com, 2011. -# +# msgid msgstr Project-Id-Version: xfce4-weather-plugin 0.6.0\n @@ -11,12 +11,11 @@ msgstr PO-Revision-Date: 2011-10-05 00:22+0200\n Last-Translator: Ivica Kolić ik...@yahoo.com\n Language-Team: Croatian ik...@yahoo.com\n -Language: \n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n -Plural-Forms: nplurals=3; plural=(n%10==1 n%100!=11 ? 0 : n%10=2 n -%10=4 (n%10010 || n%100=20) ? 1 : 2);\n +Language: \n +Plural-Forms: nplurals=3; plural=(n%10==1 n%100!=11 ? 0 : n%10=2 n%10=4 (n%10010 || n%100=20) ? 1 : 2);\n X-Poedit-Language: Croatian\n X-Poedit-SourceCharset: utf-8\n X-Poedit-Country: CROATIA\n @@ -34,9 +33,8 @@ msgid WS msgstr #: ../panel-plugin/weather.c:136 -#, fuzzy msgid WB -msgstr Z +msgstr #: ../panel-plugin/weather.c:139 ../panel-plugin/weather.c:142 msgid WD @@ -88,7 +86,8 @@ msgstr Nij moguće otvoriti sljedeći url: %s msgid Weather Update msgstr Dopune vremena -#. add refresh button to right click menu, for people who missed the middle mouse click feature +#. add refresh button to right click menu, for people who missed the middle +#. mouse click feature #: ../panel-plugin/weather.c:957 ../panel-plugin/weather-summary.c:646 msgid _Forecast msgstr _Prognoza vremena @@ -130,14 +129,12 @@ msgid Medium clouds (CM) msgstr #: ../panel-plugin/weather-config.c:47 -#, fuzzy msgid High clouds (CH) -msgstr Lagana naoblaka +msgstr #: ../panel-plugin/weather-config.c:48 -#, fuzzy msgid Cloudiness (C) -msgstr Lagana naoblaka +msgstr #: ../panel-plugin/weather-config.c:49 msgid Fog (F) @@ -173,9 +170,8 @@ msgid Metric msgstr Metrička #: ../panel-plugin/weather-config.c:469 -#, fuzzy msgid L_ocation: -msgstr Lokacija: +msgstr L_okacija: #: ../panel-plugin/weather-config.c:501 msgid Chan_ge... @@ -183,14 +179,12 @@ msgstr Promije_ni... #. proxy #: ../panel-plugin/weather-config.c:514 -#, fuzzy msgid _Proxy server: -msgstr Proxy poslužitelj: +msgstr _Proxy poslužitelj: #: ../panel-plugin/weather-config.c:519 -#, fuzzy msgid Use proxy _server -msgstr _Koristi proxy poslužitelj +msgstr Koristi proxy _poslužitelj #: ../panel-plugin/weather-config.c:521 msgid Auto-detect from _environment @@ -222,9 +216,8 @@ msgid Move _Down msgstr #: ../panel-plugin/weather-config.c:676 -#, fuzzy msgid Animate _transitions between labels -msgstr _Animiranje prijelaza između oznaka +msgstr Animiranje _prijelaza između oznaka #: ../panel-plugin/weather-data.c:131 msgid ft ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-weather-plugin:master Update NEWS and TODO.
Updating branch refs/heads/master to e8baded4d157ff03fa8c9ca0c0f7065445e11644 (commit) from 6aa63e39e0945dff27297843bcec2ee2dd14da01 (commit) commit e8baded4d157ff03fa8c9ca0c0f7065445e11644 Author: Harald Judt h.j...@gmx.at Date: Wed Jul 18 17:56:03 2012 +0200 Update NEWS and TODO. NEWS |4 TODO | 48 +++- 2 files changed, 39 insertions(+), 13 deletions(-) diff --git a/NEWS b/NEWS index dcdf911..0f5bae6 100644 --- a/NEWS +++ b/NEWS @@ -14,6 +14,10 @@ Forecasts for up to 10 days are provided, depending on the location. The location is defined by latitude and longitude, the actual name is only used for presentation. +- Switch to the new GeoIP service at geoip.xfce.org, the old one has + stopped working correctly quite some time ago. +- Automatically set system of measurement depending on the GeoIP + country code. - Fix wrong location search results (bug #8832). - Enlarge the search dialog. It's now capable of showing 10 or more results instead of only 2 or 3. diff --git a/TODO b/TODO index b175955..4cb954e 100644 --- a/TODO +++ b/TODO @@ -1,20 +1,42 @@ -* Get sunrise/sunset times via webservice - - get rid of the hardcoded values -* Fetch logo from website (code is still there) +Here is a collection of ideas and tasks for future releases, listed in +categories, but not prioritized. + +Panel widget +== * More information in tooltip - currently only location and description are shown - could optionally replace scrollbox -* Better tooltips in config dialog -* Better organisation of options in config dialog - - it's already too large for netbooks -* Apply options immediately, like in most xfce apps -* Don't complain about proxy settings on closing the config - dialog when none are entered -* Further reduce calls to download data +* Use multiple lines in scrollbox +* Use the Xfce hvbox (maybe, need to check) + +Data +== +* Get sunrise/sunset times via webservice + - get rid of the hardcoded values + - maybe met.no provides an API for it too +* Use met.no RSS feed to warn in time about API changes +* Further reduce HTTP requests fetching data - maybe use data in XML to schedule downloads? +* How about a follow-me mode: Auto-determine location + based on IP address and adapt to any changes? + +Forecast tab +== * More details in forecast window - maybe tooltips for each entry? - somehow indicate amount of precipitation -* Use the Xfce hvbox (maybe, need to check) -* Use multiple lines in scrollbox -* Use met.no RSS feed to warn in time about API changes + +Details tab +== +* Fetch logo from website (code is still there) + +Configuration dialog +== +* Show longitude and latitude, allow entering them +* Add tooltips where necessary and make the existing ones more + descriptive +* Reorganize options, the window's already to large + for the small screen size of netbooks +* Apply options immediately, like in most xfce apps +* Don't complain about proxy settings on closing the dialog window + when none are entered ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Look for GTK+2 version of gcr-3
Updating branch refs/heads/master
to 31fe130f87ffbe373e2b696de555719b3e4af07b (commit)
from d549cfd203027d8268b4e7526e42ce0edcfa8b96 (commit)
commit 31fe130f87ffbe373e2b696de555719b3e4af07b
Author: Christian Dywan christ...@twotoasts.de
Date: Wed Jul 18 23:56:24 2012 +0200
Look for GTK+2 version of gcr-3
wscript |6 +-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/wscript b/wscript
index bea428c..48dd569 100644
--- a/wscript
+++ b/wscript
@@ -181,6 +181,11 @@ def configure (conf):
atleast_version=version, mandatory=mandatory)
return conf.env['HAVE_' + var]
+if option_enabled ('gtk3'):
+check_pkg ('gcr-3', '2.32', mandatory=False)
+else:
+check_pkg ('gcr-3-gtk2', '2.32', mandatory=False)
+
if option_enabled ('unique'):
if option_enabled('gtk3'): unique_pkg = 'unique-3.0'
else: unique_pkg = 'unique-1.0'
@@ -269,7 +274,6 @@ def configure (conf):
conf.define ('HAVE_LIBSOUP_2_34_0', 1)
if check_version (conf.env['LIBSOUP_VERSION'], 2, 37, 1):
conf.define ('HAVE_LIBSOUP_2_37_1', 1)
-check_pkg ('gcr-3', '2.32', mandatory=False)
check_pkg ('libxml-2.0', '2.6')
check_pkg ('sqlite3', '3.6.19', True, var='SQLITE')
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Fix regression causing wrong tab URL ghost in urlbar
Updating branch refs/heads/master
to 7c5410468f1c2eb54f962c7ccaba3c351c5b7781 (commit)
from 31fe130f87ffbe373e2b696de555719b3e4af07b (commit)
commit 7c5410468f1c2eb54f962c7ccaba3c351c5b7781
Author: Christian Dywan christ...@twotoasts.de
Date: Thu Jul 19 01:27:48 2012 +0200
Fix regression causing wrong tab URL ghost in urlbar
midori/midori-browser.c |6 --
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 7a30766..d137765 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -8054,6 +8054,8 @@ midori_browser_get_current_tab (MidoriBrowser* browser)
{
#ifdef HAVE_GRANITE
GraniteWidgetsTab* tab;
+#else
+gint n;
#endif
g_return_val_if_fail (MIDORI_IS_BROWSER (browser), NULL);
@@ -8063,8 +8065,8 @@ midori_browser_get_current_tab (MidoriBrowser* browser)
GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser-notebook));
return tab ? granite_widgets_tab_get_page (tab) : NULL;
#else
-return midori_browser_get_nth_tab (browser,
-midori_browser_get_current_page (browser));
+n = midori_browser_get_current_page (browser);
+return (n = 0) ? midori_browser_get_nth_tab (browser, n) : NULL;
#endif
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
