0.2.3 bugfix release.

When an alarm is added, connect alarm_triggered so notifications are displayed (LP: #240728 )
Remove timer and stop player on alarm dispose.
2008-06-25 18:21:22 +02:00 · 2008-06-19 01:19:59 +02:00
27 changed files with 66 additions and 57 deletions
--- a/configure.ac
+++ b/configure.ac
@@ -2,8 +2,8 @@ dnl ***************************************************************************
 dnl *** configure.ac for ALARM-CLOCK                                        ***
 dnl ***************************************************************************

-AC_INIT([Alarm Clock], [0.2.2],
-		[Johannes H. Jensen <joh@deworks.net>],
+AC_INIT([Alarm Clock], [0.2.3],
+		[Johannes H. Jensen <joh@pseudoberries.com>],
 		[alarm-clock])
 		
 AM_CONFIG_HEADER(config.h)
--- a/src/alarm-applet.c
+++ b/src/alarm-applet.c
@@ -1,7 +1,7 @@
 /*
 * alarm-applet.c -- Alarm Clock applet bootstrap
 * 
- * Copyright (C) 2007-2008 Johannes H. Jensen <joh@deworks.net>
+ * Copyright (C) 2007-2008 Johannes H. Jensen <joh@pseudoberries.com>
 * 
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@@ -18,7 +18,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 * 
 * Authors:
- * 		Johannes H. Jensen <joh@deworks.net>
+ * 		Johannes H. Jensen <joh@pseudoberries.com>
 */

 #include "alarm-applet.h"
@@ -438,6 +438,8 @@ alarm_applet_alarms_add (AlarmApplet *applet, Alarm *alarm)
 	g_signal_connect (alarm, "notify::sound-file", G_CALLBACK (alarm_sound_file_changed), applet);
 	g_signal_connect (alarm, "notify::active", G_CALLBACK (alarm_active_changed), applet);
 	g_signal_connect (alarm, "notify::time", G_CALLBACK (alarm_active_changed), applet);
+	
+	g_signal_connect (alarm, "alarm", G_CALLBACK (alarm_triggered), applet);
 }

 void
@@ -463,6 +465,11 @@ alarm_applet_alarms_remove (AlarmApplet *applet, Alarm *alarm)
 		alarm_applet_upcoming_alarm_update (applet);
 	}
 	
+	/*
+	 * Remove any signal handlers for this alarm instance.
+	 */
+	g_signal_handlers_disconnect_matched (alarm, 0, 0, 0, NULL, NULL, NULL);
+	
 	/*
 	 * Dereference alarm
 	 */
--- a/src/alarm-applet.h
+++ b/src/alarm-applet.h
@@ -1,7 +1,7 @@
 /*
 * alarm-applet.h -- Alarm Clock applet bootstrap
 * 
- * Copyright (C) 2007-2008 Johannes H. Jensen <joh@deworks.net>
+ * Copyright (C) 2007-2008 Johannes H. Jensen <joh@pseudoberries.com>
 * 
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@@ -18,7 +18,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 * 
 * Authors:
- * 		Johannes H. Jensen <joh@deworks.net>
+ * 		Johannes H. Jensen <joh@pseudoberries.com>
 */

 #ifndef ALARMAPPLET_H_
--- a/src/alarm-gconf.c
+++ b/src/alarm-gconf.c
@@ -1,7 +1,7 @@
 /*
 * alarm-gconf.c -- GConf routines
 * 
- * Copyright (C) 2007-2008 Johannes H. Jensen <joh@deworks.net>
+ * Copyright (C) 2007-2008 Johannes H. Jensen <joh@pseudoberries.com>
 * 
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@@ -18,7 +18,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 * 
 * Authors:
- * 		Johannes H. Jensen <joh@deworks.net>
+ * 		Johannes H. Jensen <joh@pseudoberries.com>
 */

 #include <time.h>
--- a/src/alarm-gconf.h
+++ b/src/alarm-gconf.h
@@ -1,7 +1,7 @@
 /*
 * alarm-gconf.h -- GConf routines
 * 
- * Copyright (C) 2007-2008 Johannes H. Jensen <joh@deworks.net>
+ * Copyright (C) 2007-2008 Johannes H. Jensen <joh@pseudoberries.com>
 * 
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@@ -18,7 +18,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 * 
 * Authors:
- * 		Johannes H. Jensen <joh@deworks.net>
+ * 		Johannes H. Jensen <joh@pseudoberries.com>
 */

 #ifndef ALARM_GCONF_H_
--- a/src/alarm.c
+++ b/src/alarm.c
@@ -1,7 +1,7 @@
 /*
 * alarm.c -- Core alarm functionality
 * 
- * Copyright (C) 2007-2008 Johannes H. Jensen <joh@deworks.net>
+ * Copyright (C) 2007-2008 Johannes H. Jensen <joh@pseudoberries.com>
 * 
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@@ -18,7 +18,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 * 
 * Authors:
- * 		Johannes H. Jensen <joh@deworks.net>
+ * 		Johannes H. Jensen <joh@pseudoberries.com>
 */

 #include <stdio.h>
@@ -1434,6 +1434,8 @@ alarm_dispose (GObject *object)
 		parent->dispose (object);
 	
 	alarm_gconf_disconnect (alarm);
+	alarm_timer_remove(alarm);
+	alarm_clear (alarm);
 }

 /*
--- a/src/alarm.h
+++ b/src/alarm.h
@@ -1,7 +1,7 @@
 /*
 * alarm.h -- Core alarm functionality
 * 
- * Copyright (C) 2007-2008 Johannes H. Jensen <joh@deworks.net>
+ * Copyright (C) 2007-2008 Johannes H. Jensen <joh@pseudoberries.com>
 * 
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@@ -18,7 +18,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 * 
 * Authors:
- * 		Johannes H. Jensen <joh@deworks.net>
+ * 		Johannes H. Jensen <joh@pseudoberries.com>
 */

 #ifndef ALARM_H_
--- a/src/alarms-list.c
+++ b/src/alarms-list.c
@@ -1,7 +1,7 @@
 /*
 * alarms-list.d -- List alarms dialog
 * 
- * Copyright (C) 2007-2008 Johannes H. Jensen <joh@deworks.net>
+ * Copyright (C) 2007-2008 Johannes H. Jensen <joh@pseudoberries.com>
 * 
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@@ -18,7 +18,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 * 
 * Authors:
- * 		Johannes H. Jensen <joh@deworks.net>
+ * 		Johannes H. Jensen <joh@pseudoberries.com>
 */

 #include "alarms-list.h"
--- a/src/alarms-list.h
+++ b/src/alarms-list.h
@@ -1,7 +1,7 @@
 /*
 * alarms-list.h -- List alarms dialog
 * 
- * Copyright (C) 2007-2008 Johannes H. Jensen <joh@deworks.net>
+ * Copyright (C) 2007-2008 Johannes H. Jensen <joh@pseudoberries.com>
 * 
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@@ -18,7 +18,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 * 
 * Authors:
- * 		Johannes H. Jensen <joh@deworks.net>
+ * 		Johannes H. Jensen <joh@pseudoberries.com>
 */

 #ifndef ALARMSLIST_H_
--- a/src/edit-alarm.c
+++ b/src/edit-alarm.c
@@ -1,7 +1,7 @@
 /*
 * edit-alarm.c -- Alarm settings dialog
 * 
- * Copyright (C) 2007-2008 Johannes H. Jensen <joh@deworks.net>
+ * Copyright (C) 2007-2008 Johannes H. Jensen <joh@pseudoberries.com>
 * 
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@@ -18,7 +18,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 * 
 * Authors:
- * 		Johannes H. Jensen <joh@deworks.net>
+ * 		Johannes H. Jensen <joh@pseudoberries.com>
 */

 #include "edit-alarm.h"
--- a/src/edit-alarm.h
+++ b/src/edit-alarm.h
@@ -1,7 +1,7 @@
 /*
 * edit-alarm.h -- Alarm settings dialog
 * 
- * Copyright (C) 2007-2008 Johannes H. Jensen <joh@deworks.net>
+ * Copyright (C) 2007-2008 Johannes H. Jensen <joh@pseudoberries.com>
 * 
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@@ -18,7 +18,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 * 
 * Authors:
- * 		Johannes H. Jensen <joh@deworks.net>
+ * 		Johannes H. Jensen <joh@pseudoberries.com>
 */

 #ifndef EDITALARM_H_
--- a/src/list-entry.c
+++ b/src/list-entry.c
@@ -1,7 +1,7 @@
 /*
 * list-entry.c -- Simple data structure to hold name, data and icon.
 * 
- * Copyright (C) 2007-2008 Johannes H. Jensen <joh@deworks.net>
+ * Copyright (C) 2007-2008 Johannes H. Jensen <joh@pseudoberries.com>
 * 
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@@ -18,7 +18,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 * 
 * Authors:
- * 		Johannes H. Jensen <joh@deworks.net>
+ * 		Johannes H. Jensen <joh@pseudoberries.com>
 */

 #include <string.h>
--- a/src/list-entry.h
+++ b/src/list-entry.h
@@ -1,7 +1,7 @@
 /*
 * list-entry.h -- Simple data structure to hold name, data and icon.
 * 
- * Copyright (C) 2007-2008 Johannes H. Jensen <joh@deworks.net>
+ * Copyright (C) 2007-2008 Johannes H. Jensen <joh@pseudoberries.com>
 * 
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@@ -18,7 +18,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 * 
 * Authors:
- * 		Johannes H. Jensen <joh@deworks.net>
+ * 		Johannes H. Jensen <joh@pseudoberries.com>
 */

 #ifndef LISTENTRY_H_
--- a/src/player.c
+++ b/src/player.c
@@ -1,7 +1,7 @@
 /*
 * player.c - Simple media player based on GStreamer
 * 
- * Copyright (C) 2007-2008 Johannes H. Jensen <joh@deworks.net>
+ * Copyright (C) 2007-2008 Johannes H. Jensen <joh@pseudoberries.com>
 * 
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@@ -18,7 +18,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 * 
 * Authors:
- * 		Johannes H. Jensen <joh@deworks.net>
+ * 		Johannes H. Jensen <joh@pseudoberries.com>
 */

 #include <gst/gst.h>
--- a/src/player.h
+++ b/src/player.h
@@ -1,7 +1,7 @@
 /*
 * player.h - Simple media player based on GStreamer
 * 
- * Copyright (C) 2007-2008 Johannes H. Jensen <joh@deworks.net>
+ * Copyright (C) 2007-2008 Johannes H. Jensen <joh@pseudoberries.com>
 * 
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@@ -18,7 +18,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 * 
 * Authors:
- * 		Johannes H. Jensen <joh@deworks.net>
+ * 		Johannes H. Jensen <joh@pseudoberries.com>
 */

 #ifndef PLAYER_H_
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -1,7 +1,7 @@
 /*
 * prefs.c -- Alarm Clock global preferences
 * 
- * Copyright (C) 2007-2008 Johannes H. Jensen <joh@deworks.net>
+ * Copyright (C) 2007-2008 Johannes H. Jensen <joh@pseudoberries.com>
 * 
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@@ -18,7 +18,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 * 
 * Authors:
- * 		Johannes H. Jensen <joh@deworks.net>
+ * 		Johannes H. Jensen <joh@pseudoberries.com>
 */

 #include "prefs.h"
--- a/src/prefs.h
+++ b/src/prefs.h
@@ -1,7 +1,7 @@
 /*
 * prefs.h -- Alarm Clock global preferences
 * 
- * Copyright (C) 2007-2008 Johannes H. Jensen <joh@deworks.net>
+ * Copyright (C) 2007-2008 Johannes H. Jensen <joh@pseudoberries.com>
 * 
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@@ -18,7 +18,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 * 
 * Authors:
- * 		Johannes H. Jensen <joh@deworks.net>
+ * 		Johannes H. Jensen <joh@pseudoberries.com>
 */

 #ifndef PREFS_H_
--- a/src/tests/glade_view.c
+++ b/src/tests/glade_view.c
@@ -1,7 +1,7 @@
 /*
 * glade_view.c -- Test utility for running a glade file.
 * 
- * Copyright (C) 2007-2008 Johannes H. Jensen <joh@deworks.net>
+ * Copyright (C) 2007-2008 Johannes H. Jensen <joh@pseudoberries.com>
 * 
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@@ -18,7 +18,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 * 
 * Authors:
- * 		Johannes H. Jensen <joh@deworks.net>
+ * 		Johannes H. Jensen <joh@pseudoberries.com>
 */

 #include <gtk/gtk.h>
--- a/src/tests/test_alarm.c
+++ b/src/tests/test_alarm.c
@@ -1,7 +1,7 @@
 /*
 * test_alarm.c -- Alarm test suite
 * 
- * Copyright (C) 2007-2008 Johannes H. Jensen <joh@deworks.net>
+ * Copyright (C) 2007-2008 Johannes H. Jensen <joh@pseudoberries.com>
 * 
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@@ -18,7 +18,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 * 
 * Authors:
- * 		Johannes H. Jensen <joh@deworks.net>
+ * 		Johannes H. Jensen <joh@pseudoberries.com>
 */

 #include "alarm.h"
--- a/src/tests/test_gconf_recursive.c
+++ b/src/tests/test_gconf_recursive.c
@@ -1,7 +1,7 @@
 /*
 * test_gconf_recursive.c -- Test utility for recursively unsetting a gconf dir.
 * 
- * Copyright (C) 2007-2008 Johannes H. Jensen <joh@deworks.net>
+ * Copyright (C) 2007-2008 Johannes H. Jensen <joh@pseudoberries.com>
 * 
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@@ -18,7 +18,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 * 
 * Authors:
- * 		Johannes H. Jensen <joh@deworks.net>
+ * 		Johannes H. Jensen <joh@pseudoberries.com>
 */

 #include <glib.h>
--- a/src/tests/test_list_entry.c
+++ b/src/tests/test_list_entry.c
@@ -1,7 +1,7 @@
 /*
 * test_list_entry.c -- Test for AlarmListEntry
 * 
- * Copyright (C) 2007-2008 Johannes H. Jensen <joh@deworks.net>
+ * Copyright (C) 2007-2008 Johannes H. Jensen <joh@pseudoberries.com>
 * 
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@@ -18,7 +18,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 * 
 * Authors:
- * 		Johannes H. Jensen <joh@deworks.net>
+ * 		Johannes H. Jensen <joh@pseudoberries.com>
 */

 #include <glib.h>
--- a/src/tests/test_player.c
+++ b/src/tests/test_player.c
@@ -1,7 +1,7 @@
 /*
 * test_player.c -- Test utility for the MediaPlayer system.
 * 
- * Copyright (C) 2007-2008 Johannes H. Jensen <joh@deworks.net>
+ * Copyright (C) 2007-2008 Johannes H. Jensen <joh@pseudoberries.com>
 * 
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@@ -18,7 +18,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 * 
 * Authors:
- * 		Johannes H. Jensen <joh@deworks.net>
+ * 		Johannes H. Jensen <joh@pseudoberries.com>
 */

 #include <glib.h>
--- a/src/tests/test_util.c
+++ b/src/tests/test_util.c
@@ -1,7 +1,7 @@
 /*
 * glade_util.c -- Test for alarm utilities.
 * 
- * Copyright (C) 2007-2008 Johannes H. Jensen <joh@deworks.net>
+ * Copyright (C) 2007-2008 Johannes H. Jensen <joh@pseudoberries.com>
 * 
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@@ -18,7 +18,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 * 
 * Authors:
- * 		Johannes H. Jensen <joh@deworks.net>
+ * 		Johannes H. Jensen <joh@pseudoberries.com>
 */

 #include <time.h>
--- a/src/ui.c
+++ b/src/ui.c
@@ -1,7 +1,7 @@
 /*
 * ui.c - Alarm Clock applet UI routines
 * 
- * Copyright (C) 2007-2008 Johannes H. Jensen <joh@deworks.net>
+ * Copyright (C) 2007-2008 Johannes H. Jensen <joh@pseudoberries.com>
 * 
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@@ -18,7 +18,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 * 
 * Authors:
- * 		Johannes H. Jensen <joh@deworks.net>
+ * 		Johannes H. Jensen <joh@pseudoberries.com>
 */

 #include <time.h>
@@ -658,11 +658,11 @@ menu_about_cb (BonoboUIComponent *component,
 	g_debug("about_dialog");
 	
 	static const gchar *const authors[] = {
-            "Johannes H. Jensen <joh@deworks.net>",
+            "Johannes H. Jensen <joh@pseudoberries.com>",
            NULL
    };
    static const gchar *const documenters[] = {
-            "Johannes H. Jensen <joh@deworks.net>",
+            "Johannes H. Jensen <joh@pseudoberries.com>",
            NULL
    };
    static const gchar *const artists[] = {
--- a/src/ui.h
+++ b/src/ui.h
@@ -1,7 +1,7 @@
 /*
 * ui.h - Alarm Clock applet UI routines
 * 
- * Copyright (C) 2007-2008 Johannes H. Jensen <joh@deworks.net>
+ * Copyright (C) 2007-2008 Johannes H. Jensen <joh@pseudoberries.com>
 * 
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@@ -18,7 +18,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 * 
 * Authors:
- * 		Johannes H. Jensen <joh@deworks.net>
+ * 		Johannes H. Jensen <joh@pseudoberries.com>
 */

 #ifndef UI_H_
--- a/src/util.c
+++ b/src/util.c
@@ -1,7 +1,7 @@
 /*
 * util.c -- Misc utilities
 * 
- * Copyright (C) 2007-2008 Johannes H. Jensen <joh@deworks.net>
+ * Copyright (C) 2007-2008 Johannes H. Jensen <joh@pseudoberries.com>
 * 
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@@ -18,7 +18,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 * 
 * Authors:
- * 		Johannes H. Jensen <joh@deworks.net>
+ * 		Johannes H. Jensen <joh@pseudoberries.com>
 */

 #include <string.h>
--- a/src/util.h
+++ b/src/util.h
@@ -1,7 +1,7 @@
 /*
 * util.h -- Misc utilities
 * 
- * Copyright (C) 2007-2008 Johannes H. Jensen <joh@deworks.net>
+ * Copyright (C) 2007-2008 Johannes H. Jensen <joh@pseudoberries.com>
 * 
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@@ -18,7 +18,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 * 
 * Authors:
- * 		Johannes H. Jensen <joh@deworks.net>
+ * 		Johannes H. Jensen <joh@pseudoberries.com>
 */

 #ifndef UTIL_H_
Author	SHA1	Message	Date
Johannes H. Jensen	18d6a2f889	0.2.3 bugfix release.	2008-06-25 18:21:22 +02:00
Johannes H. Jensen	51515f9d51	When an alarm is added, connect alarm_triggered so notifications are displayed (LP: #240728 ) Remove timer and stop player on alarm dispose.	2008-06-19 01:19:59 +02:00