summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2013-12-23 13:28:31 -0800
committerStefano Karapetsas <[email protected]>2013-12-23 13:28:31 -0800
commit4ad6c16ece62b4f5dc90ac96623c5643e97a1921 (patch)
tree6cb7c142584cb9376e6f5e82c54d4344bc403ed3
parent40180c1e529161e8ce1cefbbe311b894383c6fe5 (diff)
parent4d1a88869536ba3083a4472c823b379bd63f310d (diff)
downloadmate-applets-4ad6c16ece62b4f5dc90ac96623c5643e97a1921.tar.bz2
mate-applets-4ad6c16ece62b4f5dc90ac96623c5643e97a1921.tar.xz
Merge pull request #69 from flexiondotorg/1.6
Cherry picks for `mate-applets` 1.6
Diffstat
-rw-r--r--accessx-status/docs/C/mate-accessx-status.xml2
-rw-r--r--battstat/battstat-upower.c2
-rw-r--r--battstat/docs/C/mate-battstat.xml2
-rw-r--r--drivemount/help/C/mate-drivemount.xml2
-rw-r--r--geyes/docs/C/mate-geyes.xml14
-rw-r--r--invest-applet/data/org.mate.applets.InvestApplet.mate-panel-applet.in.in2
-rw-r--r--invest-applet/invest/chart.py2
-rw-r--r--invest-applet/invest/quotes.py2
-rw-r--r--mateweather/docs/C/mateweather.xml10
-rw-r--r--multiload/docs/C/mate-multiload.xml2
-rw-r--r--stickynotes/docs/C/mate-stickynotes_applet.xml6
-rw-r--r--stickynotes/stickynotes_applet_callbacks.c2
12 files changed, 25 insertions, 23 deletions
diff --git a/accessx-status/docs/C/mate-accessx-status.xml b/accessx-status/docs/C/mate-accessx-status.xml
index c3d70c6d..ce512ff7 100644
--- a/accessx-status/docs/C/mate-accessx-status.xml
+++ b/accessx-status/docs/C/mate-accessx-status.xml
@@ -93,7 +93,7 @@
<revnumber>&applet; Applet Manual V0.1</revnumber>
<date>March 2003</date>
<revdescription>
- <para role="author">Sun MATE Documentation Team
+ <para role="author">Sun GNOME Documentation Team
</para>
<para role="publisher">MATE Documentation Project</para>
</revdescription>
diff --git a/battstat/battstat-upower.c b/battstat/battstat-upower.c
index 36acb408..55929491 100644
--- a/battstat/battstat-upower.c
+++ b/battstat/battstat-upower.c
@@ -86,10 +86,12 @@ battstat_upower_initialise (void (*callback) (void))
GCancellable *cancellable = g_cancellable_new();
GError *gerror;
+#if !UP_CHECK_VERSION(0, 9, 99)
if (! up_client_enumerate_devices_sync( upc, cancellable, &gerror ) ) {
sprintf(error_str, "Unable to enumerate upower devices: %s\n", gerror->message);
goto error_shutdownclient;
}
+#endif
g_signal_connect_after( upc, "device-changed", device_cb, NULL );
g_signal_connect_after( upc, "device-added", device_cb, NULL );
diff --git a/battstat/docs/C/mate-battstat.xml b/battstat/docs/C/mate-battstat.xml
index 74e5ea60..983772d5 100644
--- a/battstat/docs/C/mate-battstat.xml
+++ b/battstat/docs/C/mate-battstat.xml
@@ -144,7 +144,7 @@
<revnumber>Battery Charge Monitor Applet Manual V2.2</revnumber>
<date>August 2004</date>
<revdescription>
- <para role="author">Sun MATE Documentation Team</para>
+ <para role="author">Sun GNOME Documentation Team</para>
<para role="publisher">MATE Documentation Project</para>
</revdescription>
</revision>
diff --git a/drivemount/help/C/mate-drivemount.xml b/drivemount/help/C/mate-drivemount.xml
index 28bd57fd..92e2db80 100644
--- a/drivemount/help/C/mate-drivemount.xml
+++ b/drivemount/help/C/mate-drivemount.xml
@@ -119,7 +119,7 @@
<revnumber>&appname; Applet Manual V2.1</revnumber>
<date>February 2004</date>
<revdescription>
- <para role="author">Sun MATE Documentation Team</para>
+ <para role="author">Sun GNOME Documentation Team</para>
<para role="publisher">MATE Documentation Project</para>
</revdescription>
</revision>
diff --git a/geyes/docs/C/mate-geyes.xml b/geyes/docs/C/mate-geyes.xml
index 81355a8e..58ba1d98 100644
--- a/geyes/docs/C/mate-geyes.xml
+++ b/geyes/docs/C/mate-geyes.xml
@@ -107,7 +107,7 @@
<revnumber>&applet; Applet Manual V2.6</revnumber>
<date>February 2004</date>
<revdescription>
- <para role="author">Sun MATE Documentation Team</para>
+ <para role="author">Sun GNOME Documentation Team</para>
<para role="publisher">MATE Documentation Project</para>
</revdescription>
</revision>
@@ -115,7 +115,7 @@
<revnumber>Geyes Applet Manual V2.5</revnumber>
<date>September 2003</date>
<revdescription>
- <para role="author">Sun MATE Documentation Team</para>
+ <para role="author">Sun GNOME Documentation Team</para>
<para role="publisher">MATE Documentation Project</para>
</revdescription>
</revision>
@@ -123,7 +123,7 @@
<revnumber>Geyes Applet Manual V2.4</revnumber>
<date>August 2003</date>
<revdescription>
- <para role="author">Sun MATE Documentation Team</para>
+ <para role="author">Sun GNOME Documentation Team</para>
<para role="publisher">MATE Documentation Project</para>
</revdescription>
</revision>
@@ -131,7 +131,7 @@
<revnumber>Geyes Applet Manual V2.3</revnumber>
<date>January 2003</date>
<revdescription>
- <para role="author">Sun MATE Documentation Team</para>
+ <para role="author">Sun GNOME Documentation Team</para>
<para role="publisher">MATE Documentation Project</para>
</revdescription>
</revision>
@@ -139,7 +139,7 @@
<revnumber>Geyes Applet Manual V2.2</revnumber>
<date>August 2002</date>
<revdescription>
- <para role="author">Sun MATE Documentation Team</para>
+ <para role="author">Sun GNOME Documentation Team</para>
<para role="publisher">MATE Documentation Project</para>
</revdescription>
</revision>
@@ -147,7 +147,7 @@
<revnumber>Geyes Applet Manual V2.1</revnumber>
<date>June 2002</date>
<revdescription>
- <para role="author">Sun MATE Documentation Team</para>
+ <para role="author">Sun GNOME Documentation Team</para>
<para role="publisher">MATE Documentation Project</para>
</revdescription>
</revision>
@@ -155,7 +155,7 @@
<revnumber>Geyes Applet Manual V2.0</revnumber>
<date>March 2002</date>
<revdescription>
- <para role="author">Sun MATE Documentation Team</para>
+ <para role="author">Sun GNOME Documentation Team</para>
<para role="publisher">MATE Documentation Project</para>
</revdescription>
</revision>
diff --git a/invest-applet/data/org.mate.applets.InvestApplet.mate-panel-applet.in.in b/invest-applet/data/org.mate.applets.InvestApplet.mate-panel-applet.in.in
index 00a83afb..dced4d50 100644
--- a/invest-applet/data/org.mate.applets.InvestApplet.mate-panel-applet.in.in
+++ b/invest-applet/data/org.mate.applets.InvestApplet.mate-panel-applet.in.in
@@ -7,7 +7,7 @@ _Description=Factory for creating the invest applet.
[InvestApplet]
_Name=Invest
_Description=Track your invested money.
-Icon=invest-applet
+Icon=mate-invest-applet
BonoboId=OAFIID:Invest_Applet_Factory
X-MATE-Bugzilla-Bugzilla=MATE
X-MATE-Bugzilla-Product=mate-applets
diff --git a/invest-applet/invest/chart.py b/invest-applet/invest/chart.py
index e13e0686..0899351d 100644
--- a/invest-applet/invest/chart.py
+++ b/invest-applet/invest/chart.py
@@ -210,7 +210,7 @@ class FinancialChart:
a += "%s%s," % (name[1:], param)
# Create the image URL -----------------------------------------------------
- chart_base_url = "http://ichart.europe.yahoo.com/z?s=%(s)s&t=%(t)s&q=%(q)s&l=%(l)s&z=%(z)s&p=%(p)s&a=%(a)s%(opt)s"
+ chart_base_url = "http://chart.finance.yahoo.com/z?s=%(s)s&t=%(t)s&q=%(q)s&l=%(l)s&z=%(z)s&p=%(p)s&a=%(a)s%(opt)s"
url = chart_base_url % {
"s": tickers[0],
"t": self.time_ranges[self.ui.get_object("t").get_active()],
diff --git a/invest-applet/invest/quotes.py b/invest-applet/invest/quotes.py
index 44943b1d..448c13bd 100644
--- a/invest-applet/invest/quotes.py
+++ b/invest-applet/invest/quotes.py
@@ -287,7 +287,7 @@ class QuoteUpdater(Gtk.ListStore):
self.add_balance_change(balance, change, val["currency"])
if len(ticker.split('.')) == 2:
- url = 'http://ichart.europe.yahoo.com/h?s=%s' % ticker
+ url = 'http://chart.finance.yahoo.com/h?s=%s' % ticker
else:
url = 'http://ichart.yahoo.com/h?s=%s' % ticker
diff --git a/mateweather/docs/C/mateweather.xml b/mateweather/docs/C/mateweather.xml
index a951a482..13e810cb 100644
--- a/mateweather/docs/C/mateweather.xml
+++ b/mateweather/docs/C/mateweather.xml
@@ -160,7 +160,7 @@ customizable.</para>
<revnumber>&applet; Applet Manual V2.4</revnumber>
<date>February 2004</date>
<revdescription>
- <para role="author">Sun MATE Documentation Team</para>
+ <para role="author">Sun GNOME Documentation Team</para>
<para role="publisher">MATE Documentation Project</para>
</revdescription>
</revision>
@@ -168,7 +168,7 @@ customizable.</para>
<revnumber>Weather Report Applet Manual V2.3</revnumber>
<date>January 2003</date>
<revdescription>
- <para role="author">Sun MATE Documentation Team</para>
+ <para role="author">Sun GNOME Documentation Team</para>
<para role="publisher">MATE Documentation Project</para>
</revdescription>
</revision>
@@ -176,7 +176,7 @@ customizable.</para>
<revnumber>Weather Report Applet Manual V2.2</revnumber>
<date>August 2002</date>
<revdescription>
- <para role="author">Sun MATE Documentation Team</para>
+ <para role="author">Sun GNOME Documentation Team</para>
<para role="publisher">MATE Documentation Project</para>
</revdescription>
</revision>
@@ -184,7 +184,7 @@ customizable.</para>
<revnumber>Weather Report Applet Manual V2.1</revnumber>
<date>July 2002</date>
<revdescription>
- <para role="author">Sun MATE Documentation Team</para>
+ <para role="author">Sun GNOME Documentation Team</para>
<para role="publisher">MATE Documentation Project</para>
</revdescription>
</revision>
@@ -192,7 +192,7 @@ customizable.</para>
<revnumber>Weather Report Applet Manual V2.0</revnumber>
<date>March 2002</date>
<revdescription>
- <para role="author">Sun MATE Documentation Team</para>
+ <para role="author">Sun GNOME Documentation Team</para>
<para role="publisher">MATE Documentation Project</para>
</revdescription>
</revision>
diff --git a/multiload/docs/C/mate-multiload.xml b/multiload/docs/C/mate-multiload.xml
index b3c499f4..56aec005 100644
--- a/multiload/docs/C/mate-multiload.xml
+++ b/multiload/docs/C/mate-multiload.xml
@@ -121,7 +121,7 @@
<revnumber>System Monitor Applet Manual V2.1</revnumber>
<date>February 2004</date>
<revdescription>
- <para role="author">Sun MATE Documentation Team</para>
+ <para role="author">Sun GNOME Documentation Team</para>
<para role="publisher">MATE Documentation Project</para>
</revdescription>
</revision>
diff --git a/stickynotes/docs/C/mate-stickynotes_applet.xml b/stickynotes/docs/C/mate-stickynotes_applet.xml
index 59605c6e..839f8776 100644
--- a/stickynotes/docs/C/mate-stickynotes_applet.xml
+++ b/stickynotes/docs/C/mate-stickynotes_applet.xml
@@ -131,7 +131,7 @@ Template last modified Mar 12, 2002
<revnumber>&applet; Applet Manual V2.3</revnumber>
<date>February 2004</date>
<revdescription>
- <para role="author">Sun MATE Documentation Team</para>
+ <para role="author">Sun GNOME Documentation Team</para>
<para role="publisher">MATE Documentation Project</para>
</revdescription>
</revision>
@@ -139,7 +139,7 @@ Template last modified Mar 12, 2002
<revnumber>&applet; Applet Manual V2.2</revnumber>
<date>November 2003</date>
<revdescription>
- <para role="author">Sun MATE Documentation Team</para>
+ <para role="author">Sun GNOME Documentation Team</para>
<para role="publisher">MATE Documentation Project</para>
</revdescription>
</revision>
@@ -147,7 +147,7 @@ Template last modified Mar 12, 2002
<revnumber>&applet; Applet Manual V2.1</revnumber>
<date>August 2003</date>
<revdescription>
- <para role="author">Sun MATE Documentation Team</para>
+ <para role="author">Sun GNOME Documentation Team</para>
<para role="publisher">MATE Documentation Project</para>
</revdescription>
</revision>
diff --git a/stickynotes/stickynotes_applet_callbacks.c b/stickynotes/stickynotes_applet_callbacks.c
index 93ac4808..72915a4c 100644
--- a/stickynotes/stickynotes_applet_callbacks.c
+++ b/stickynotes/stickynotes_applet_callbacks.c
@@ -409,7 +409,7 @@ menu_about_cb (GtkAction *action,
static const gchar *documenters[] = {
"Loban A Rahman <[email protected]>",
- "Sun MATE Documentation Team <[email protected]>",
+ "Sun GNOME Documentation Team <[email protected]>",
NULL
};
generated by cgit v1.2.1 (git 2.18.0) at 2024-04-25 06:12:07 +0000