GNOME.org
 

[gnome-applets/gnome-2-26] Merge master back to gnome-2-26

commit c613716f22d32876aab2ad19f38f036d3109b334
Author: Callum McKenzie <callum spooky-possum org>
Date:   Thu Apr 23 18:43:04 2009 +1200

    Merge master back to gnome-2-26
    
    gnome-applets 2.26.1 was mistakenly released from master rather than the
    gnome-2-26 branch. Fortunately the difference between the two branches
    consisted almost entirely of fixes for very minor bugs. This commit back-
    ports the code introduced into 2.26.1 onto the gnome-2-26 tree so future
    2.26 releases don't introduce regressions.
---
 ChangeLog                     |   10 ++++++++++
 NEWS                          |   17 +++++++++++++++++
 battstat/ChangeLog            |    5 +++++
 battstat/battstat_applet.c    |    8 ++++----
 configure.in                  |    2 +-
 cpufreq/ChangeLog             |   12 ++++++++++++
 cpufreq/src/cpufreq-monitor.c |    4 ++--
 drivemount/ChangeLog          |    6 ++++--
 drivemount/drive-button.c     |   23 ++++++++++++++++-------
 gweather/ChangeLog            |    6 ++++++
 gweather/gweather-applet.c    |    6 +++---
 gweather/gweather-pref.c      |   10 +++++-----
 modemlights/ChangeLog         |    5 +++++
 modemlights/modem-applet.c    |    6 +++---
 null_applet/ChangeLog         |    6 ++++++
 null_applet/null_applet.c     |   14 +++++---------
 stickynotes/ChangeLog         |   11 +++++++++++
 stickynotes/stickynotes.c     |    4 ++--
 18 files changed, 117 insertions(+), 38 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 819d84b..c65a767 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2009-04-19  Callum McKenzie  <callum spooky-possum org>
+
+	* gnome-applets.doap: Add the project description to make cgit
+	happy.
+
+2009-04-13  Callum McKenzie  <callum spooky-possum org>
+
+	* configure.in: 
+	* NEWS: 2.26.1
+
 2009-03-20  Claude Paroz  <claude 2xlibre net>
 
 	* {help/docs}/<lang>/figures/*.png: Many duplicated figures deleted.
diff --git a/NEWS b/NEWS
index 00c3453..75281b9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,20 @@
+Changes in GNOME-Applets 2.26.1
+===============================
+
+Drivemount Applet:
+ - Don't crash if the icons can't be found or gconf is down (340410, Callum
+   McKenzie).
+Keyboard Accessibility Indicator:
+ - Load icons correctly (576707, Callum McKenzie).
+Weather Applet:
+ - Fix a crash if the locations could not be read (554856, Callum McKenzie).
+
+Translation Updates:
+ ar, as, crh, it, kn, sr
+
+Documentation Translation Updates:
+ cs, el, ru
+
 Changes in GNOME-Applets 2.26.0
 ===============================
 
diff --git a/battstat/ChangeLog b/battstat/ChangeLog
index 83136dd..664ab69 100644
--- a/battstat/ChangeLog
+++ b/battstat/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-20  Callum McKenzie  <callum spooky-possum org>
+
+	* battstat_applet.c: Patch from gQuigs to replace g_timeout_add
+	with g_timeout_add_seconds where appropriate. Bug 57360.
+
 ==================== 2.26.0 ======================
 
 2009-03-06  Philip Withnall  <philip tecnocode co uk>
diff --git a/battstat/battstat_applet.c b/battstat/battstat_applet.c
index c4c5672..2a31d76 100644
--- a/battstat/battstat_applet.c
+++ b/battstat/battstat_applet.c
@@ -1018,11 +1018,11 @@ check_for_updates( gpointer data )
   {
     int timeout;
 
-    /* if on AC and not even driven scale back the polls to once every 10 */
+    /* if on AC and not event driven scale back the polls to once every 10 */
     if (info.on_ac_power)
-      timeout = 10000;
+      timeout = 10;
     else
-      timeout = 1000;
+      timeout = 2;
 
     if (timeout != battstat->timeout)
     {
@@ -1031,7 +1031,7 @@ check_for_updates( gpointer data )
       if (battstat->timeout_id)
         g_source_remove (battstat->timeout_id);
 
-      battstat->timeout_id = g_timeout_add (battstat->timeout,
+      battstat->timeout_id = g_timeout_add_seconds (battstat->timeout,
                                             check_for_updates,
                                             battstat);
     }
diff --git a/configure.in b/configure.in
index 113f3b3..667797f 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl ***************************************************************************
 dnl *** configure.in for GNOME-APPLETS                                      ***
 dnl ***************************************************************************
-AC_INIT(gnome-applets, 2.26.0)
+AC_INIT(gnome-applets, 2.26.1)
 AC_PREREQ(2.59)
 
 AM_CONFIG_HEADER(config.h)
diff --git a/cpufreq/ChangeLog b/cpufreq/ChangeLog
index 261450a..11cc95f 100644
--- a/cpufreq/ChangeLog
+++ b/cpufreq/ChangeLog
@@ -1,3 +1,15 @@
+2009-04-06  Callum McKenzie  <callum spooky-possum org>
+
+	* cpufreq-preferences.ui:
+	* cpufreq-preferences.glade: Remove translatable flag from padding
+	strings. Bug 577511.
+
+2009-03-20  Callum McKenzie  <callum spooky-possum org>
+
+	* src/cpufreq-monitor.c: Patch from gQuigs to replace
+	g_timeout_add with g_timeout_add_seconds where appropriate. Bug
+	57360.
+
 ==================== 2.26.0 ======================
 
 2009-03-08  Albert Damen  <albrt gmx net>
diff --git a/cpufreq/src/cpufreq-monitor.c b/cpufreq/src/cpufreq-monitor.c
index c5dbc06..150fbfc 100644
--- a/cpufreq/src/cpufreq-monitor.c
+++ b/cpufreq/src/cpufreq-monitor.c
@@ -24,7 +24,7 @@
 #define CPUFREQ_MONITOR_GET_PRIVATE(obj) \
         (G_TYPE_INSTANCE_GET_PRIVATE((obj), CPUFREQ_TYPE_MONITOR, CPUFreqMonitorPrivate))
 
-#define CPUFREQ_MONITOR_INTERVAL 1000
+#define CPUFREQ_MONITOR_INTERVAL 1
 
 /* Properties */
 enum {
@@ -316,7 +316,7 @@ cpufreq_monitor_run (CPUFreqMonitor *monitor)
                 return;
 
         monitor->priv->timeout_handler =
-                g_timeout_add (CPUFREQ_MONITOR_INTERVAL,
+                g_timeout_add_seconds (CPUFREQ_MONITOR_INTERVAL,
                                (GSourceFunc) cpufreq_monitor_run_cb,
                                (gpointer) monitor);
 }
diff --git a/drivemount/ChangeLog b/drivemount/ChangeLog
index 8654f7b..2a5899a 100644
--- a/drivemount/ChangeLog
+++ b/drivemount/ChangeLog
@@ -1,8 +1,10 @@
 2009-03-20  Callum McKenzie  <callum spooky-possum org>
 
 	* drive-button.c: Check that we get a valid response from gconf
-	when asking for the play command. Bug 340410.  Also avoid a crash
-	when no icons can be found.
+	when asking for the play command (and use a default if there
+	isn't). Bug 340410. Also avoid a crash when no icons can be
+	found and make sure that run_command doesn't hang when given an
+	unrecognised % escape.
 
 ==================== 2.26.0 ======================
 
diff --git a/drivemount/drive-button.c b/drivemount/drive-button.c
index 8e10862..9100ac2 100644
--- a/drivemount/drive-button.c
+++ b/drivemount/drive-button.c
@@ -593,6 +593,9 @@ gvm_run_command (const char *device, const char *command, const char *path)
 			g_string_append (exec, path);
 			q = p + 2;
 			p = p + 2;
+		} else {
+		        /* Ignore anything else. */
+		        p++;
 		}
 	}
 	g_string_append (exec, q);
@@ -798,28 +801,34 @@ eject_drive (DriveButton *self, GtkWidget *item)
     }
 }
 static void
-play_autoplay_media (DriveButton *self, const char *autoplay_key)
+play_autoplay_media (DriveButton *self, const char *autoplay_key, 
+		     const char *dflt)
 {
 	GConfClient *gconf_client = gconf_client_get_default ();
 	char *command = gconf_client_get_string (gconf_client,
 			autoplay_key, NULL);
-	if (command) {
-	        run_command (self, command);
-		g_free (command);
-	}
+
+	if (!command)
+	    command = g_strdup (dflt);
+
+	run_command (self, command);
+
+	g_free (command);
 	g_object_unref (gconf_client);
 }
 
 static void
 play_dvd (DriveButton *self, GtkWidget *item)
 {
-	play_autoplay_media (self, GCONF_ROOT_AUTOPLAY "autoplay_dvd_command");
+        play_autoplay_media (self, GCONF_ROOT_AUTOPLAY "autoplay_dvd_command",
+			     "totem %d");
 }
 
 static void
 play_cda (DriveButton *self, GtkWidget *item)
 {
-	play_autoplay_media (self, GCONF_ROOT_AUTOPLAY "autoplay_cda_command");
+        play_autoplay_media (self, GCONF_ROOT_AUTOPLAY "autoplay_cda_command",
+			     "sound-juicer -d %d");
 }
 
 static void
diff --git a/gweather/ChangeLog b/gweather/ChangeLog
index ae32e35..96dcd05 100644
--- a/gweather/ChangeLog
+++ b/gweather/ChangeLog
@@ -12,6 +12,12 @@
 	* gweather-pref.c (find_entry_changed): Add a quick fix for
 	554856: check that the model is not NULL.
 
+2009-03-20  Callum McKenzie  <callum spooky-possum org>
+
+	* gweather-pref.c: 	
+	* gweather-applet.c: Patch from gQuigs to replace g_timeout_add
+	with g_timeout_add_seconds where appropriate. Bug 57360.
+
 ==================== 2.26.0 ======================
 
 2009-03-06  Philip Withnall  <philip tecnocode co uk>
diff --git a/gweather/gweather-applet.c b/gweather/gweather-applet.c
index 4e38b0e..101d64f 100644
--- a/gweather/gweather-applet.c
+++ b/gweather/gweather-applet.c
@@ -398,14 +398,14 @@ update_finish (WeatherInfo *info, gpointer data)
     if (gw_applet->gweather_pref.update_enabled)
     {
 	gw_applet->timeout_tag =
-		g_timeout_add (
-                       gw_applet->gweather_pref.update_interval * 1000,
+		g_timeout_add_seconds (
+                       gw_applet->gweather_pref.update_interval,
                         timeout_cb, gw_applet);
 
         nxtSunEvent = weather_info_next_sun_event(gw_applet->gweather_info);
         if (nxtSunEvent >= 0)
             gw_applet->suncalc_timeout_tag =
-                        g_timeout_add (nxtSunEvent * 1000,
+                        g_timeout_add_seconds (nxtSunEvent,
                                 suncalc_timeout_cb, gw_applet);
     }
 
diff --git a/gweather/gweather-pref.c b/gweather/gweather-pref.c
index 9de0cd2..4d8465e 100644
--- a/gweather/gweather-pref.c
+++ b/gweather/gweather-pref.c
@@ -344,13 +344,13 @@ auto_update_toggled (GtkToggleButton *button, GWeatherPref *pref)
     if (gw_applet->suncalc_timeout_tag > 0)
         g_source_remove(gw_applet->suncalc_timeout_tag);
     if (gw_applet->gweather_pref.update_enabled) {
-        gw_applet->timeout_tag = g_timeout_add (
-				gw_applet->gweather_pref.update_interval * 1000,
+        gw_applet->timeout_tag = g_timeout_add_seconds (
+				gw_applet->gweather_pref.update_interval,
 				timeout_cb, gw_applet);
 	nxtSunEvent = weather_info_next_sun_event(gw_applet->gweather_info);
 	if (nxtSunEvent >= 0)
-	    gw_applet->suncalc_timeout_tag = g_timeout_add (
-	    						nxtSunEvent * 1000,
+	    gw_applet->suncalc_timeout_tag = g_timeout_add_seconds (
+	    						nxtSunEvent,
 							suncalc_timeout_cb,
 							gw_applet);
     }
@@ -548,7 +548,7 @@ update_interval_changed (GtkSpinButton *button, GWeatherPref *pref)
         g_source_remove(gw_applet->timeout_tag);
     if (gw_applet->gweather_pref.update_enabled)
         gw_applet->timeout_tag =  
-        	g_timeout_add (gw_applet->gweather_pref.update_interval * 1000,
+        	g_timeout_add_seconds (gw_applet->gweather_pref.update_interval,
                                  timeout_cb, gw_applet);
 }
 
diff --git a/modemlights/ChangeLog b/modemlights/ChangeLog
index 8dcb32d..eddf76b 100644
--- a/modemlights/ChangeLog
+++ b/modemlights/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-20  Callum McKenzie  <callum spooky-possum org>
+
+	* modem-applet.c: Patch from gQuigs to replace g_timeout_add with
+	g_timeout_add_seconds where appropriate. Bug 57360.
+
 ==================== 2.26.0 ======================
 
 ==================== 2.25.92 ======================
diff --git a/modemlights/modem-applet.c b/modemlights/modem-applet.c
index af78123..4acf203 100644
--- a/modemlights/modem-applet.c
+++ b/modemlights/modem-applet.c
@@ -210,7 +210,7 @@ modem_applet_init (ModemApplet *applet)
   priv->directives = NULL;
   priv->directives_id = g_timeout_add (250, (GSourceFunc) dispatch_directives, applet);
   priv->directive_running = FALSE;
-  priv->tooltip_id = g_timeout_add (1000, (GSourceFunc) update_tooltip, applet);
+  priv->tooltip_id = g_timeout_add_seconds (1, (GSourceFunc) update_tooltip, applet);
 
   launch_backend (applet, FALSE);
   gtk_container_add (GTK_CONTAINER (applet), priv->image);
@@ -878,8 +878,8 @@ launch_backend (ModemApplet *applet, gboolean root_auth)
 	  close (p[1]);
 
 	  priv->read_fd = p[0];
-	  priv->timeout_id = g_timeout_add (1000, (GSourceFunc) check_backend, applet);
-	  priv->info_id = g_timeout_add (2500, (GSourceFunc) update_info, applet);
+	  priv->timeout_id = g_timeout_add_seconds (1, (GSourceFunc) check_backend, applet);
+	  priv->info_id = g_timeout_add_seconds (3, (GSourceFunc) update_info, applet);
 	  priv->read_stream = fdopen (priv->read_fd, "r");
 	  priv->write_stream = fdopen (priv->write_fd, "w");
 	  priv->has_root = root_auth;
diff --git a/null_applet/ChangeLog b/null_applet/ChangeLog
index bb3f30d..5fe053f 100644
--- a/null_applet/ChangeLog
+++ b/null_applet/ChangeLog
@@ -1,3 +1,9 @@
+2009-03-20  Callum McKenzie  <callum spooky-possum org>
+
+	* null_applet.c (get_all_applets): Mark the applet names as
+	translatable (bug 575107). Remove some unnecessary (debugging)
+	warning messages. Fix a warning message.
+
 ==================== 2.26.0 ======================
 
 2009-03-16  Callum McKenzie  <callum spooky-possum org>
diff --git a/null_applet/null_applet.c b/null_applet/null_applet.c
index a9f93d6..a3898fb 100644
--- a/null_applet/null_applet.c
+++ b/null_applet/null_applet.c
@@ -37,13 +37,13 @@ insert_oafiids (GHashTable *hash_table)
 	 * Add OAFIID's and descriptions of deprecated applets here
 	 */
 	g_hash_table_insert (hash_table,
-			"OAFIID:GNOME_MailcheckApplet", "Inbox Monitor");
+			     "OAFIID:GNOME_MailcheckApplet", _("Inbox Monitor"));
 	g_hash_table_insert (hash_table,
-			"OAFIID:GNOME_CDPlayerApplet", "CD Player");
+			     "OAFIID:GNOME_CDPlayerApplet", _("CD Player"));
 	g_hash_table_insert (hash_table,
-			     "OAFIID:GNOME_MixerApplet_Factory", "Volume Control");
+			     "OAFIID:GNOME_MixerApplet_Factory", _("Volume Control"));
 	g_hash_table_insert (hash_table,
-			     "OAFIID:GNOME_MixerApplet", "Volume Control");
+			     "OAFIID:GNOME_MixerApplet", _("Volume Control"));
 }
 
 static gboolean already_running;
@@ -87,7 +87,7 @@ static char
 
 	for (l = list; l; l = l->next)
 	{
-		key = g_strdup_printf ("%s/bonobo_iid", l->data);
+	    key = g_strdup_printf ("%s/bonobo_iid", (gchar *)l->data);
 		oafiid = gconf_client_get_string (client, key, &error);
 		if (error)
 		{
@@ -102,8 +102,6 @@ static char
 			name = g_hash_table_lookup (hash_table, oafiid);
 			if (name)
 			{
-				g_warning ("Deleting %s (%s) from config",
-					oafiid, name);
 				gconf_client_recursive_unset (client, l->data,
 					GCONF_UNSET_INCLUDING_SCHEMA_NAMES,
 					&error);
@@ -137,11 +135,9 @@ applet_factory (PanelApplet *applet,
 
 	if (already_running)
 	{
-		g_warning ("not first applet, ignoring");
 		return FALSE;
 	}
 	already_running = TRUE;
-	g_warning ("was given applet to handle\n");
 
 	applet_list = get_all_applets ();
 
diff --git a/stickynotes/ChangeLog b/stickynotes/ChangeLog
index 10285b4..f974814 100644
--- a/stickynotes/ChangeLog
+++ b/stickynotes/ChangeLog
@@ -1,8 +1,19 @@
+2009-04-06  Callum McKenzie  <callum spooky-possum org>
+
+	* stickynotes.glade: 
+	* stickynotes.ui: Remove translatable flag from padding
+	strings. Bug 577509.
+
 2009-04-04  Simos Xenitellis  <simos gnome org>
 
 	* docs/el/figures/*.png: Added five screenshots
 	by Fotis Tsamis.
 
+2009-03-20  Callum McKenzie  <callum spooky-possum org>
+
+	* stickynotes.c: Patch from gQuigs to replace g_timeout_add with
+	g_timeout_add_seconds where appropriate. Bug 57360.
+
 ==================== 2.26.0 ======================
 
 ==================== 2.25.92 ======================
diff --git a/stickynotes/stickynotes.c b/stickynotes/stickynotes.c
index 860d0f7..bd7e9a9 100644
--- a/stickynotes/stickynotes.c
+++ b/stickynotes/stickynotes.c
@@ -79,7 +79,7 @@ buffer_changed (GtkTextBuffer *buffer, gpointer data)
 	   the timer triggers, we will save the buffer if there have
 	   been no subsequent changes.  */
 	++stickynotes->last_timeout_data;
-	g_timeout_add (1000 * 10, (GSourceFunc) timeout_happened,
+	g_timeout_add_seconds (10, (GSourceFunc) timeout_happened,
 		       GUINT_TO_POINTER (stickynotes->last_timeout_data));
 }
 
@@ -852,7 +852,7 @@ stickynotes_save (void)
 {
   /* If a save isn't already schedules, save everything a minute from now. */
   if (!save_scheduled) {
-    g_timeout_add (60*1000, (GSourceFunc) stickynotes_save_now, NULL);
+    g_timeout_add_seconds (60, (GSourceFunc) stickynotes_save_now, NULL);
     save_scheduled = TRUE;
   }
 }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]