7 Commits
0.2.1 ... 0.2.3

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
Johannes H. Jensen
f4467d6fcb 0.2.2 bugfix release. 2008-05-12 14:33:42 +02:00
Johannes H. Jensen
e894d16dcd Put tests in check_PROGRAMS to prevent compilation when invoking 'make all' (LP: #229443) 2008-05-12 14:06:50 +02:00
Johannes H. Jensen
06e42b795a Removed tests from 'make all'. They can still be run inside src/tests. (LP: #229443) 2008-05-12 13:52:33 +02:00
Johannes H. Jensen
7853beed51 Removed tests from 'make all'. They can still be run inside src/tests 2008-05-12 13:40:42 +02:00
Johannes H. Jensen
3fed8fef09 Fixed a compilation bug. 2008-05-07 15:21:34 +02:00
28 changed files with 68 additions and 59 deletions

View File

@@ -2,8 +2,8 @@ dnl ***************************************************************************
dnl *** configure.ac for ALARM-CLOCK ***
dnl ***************************************************************************
AC_INIT([Alarm Clock], [0.2.1],
[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)

View File

@@ -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
*/

View File

@@ -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_

View File

@@ -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>

View File

@@ -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_

View File

@@ -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);
}
/*

View File

@@ -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_
@@ -157,7 +157,7 @@ typedef enum {
* Player backoff timeout.
* We will stop the player automatically after 20 minutes.
*/
#define ALARM_SOUND_TIMEOUT (60 * 20);
#define ALARM_SOUND_TIMEOUT (60 * 20)
/*
* Function prototypes.

View File

@@ -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"

View File

@@ -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_

View File

@@ -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"

View File

@@ -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_

View File

@@ -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>

View File

@@ -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_

View File

@@ -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>

View File

@@ -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_

View File

@@ -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"

View File

@@ -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_

View File

@@ -12,7 +12,7 @@ INCLUDES = \
-I$(includedir) \
-I$(top_srcdir)/src
noinst_PROGRAMS = $(TEST_PROGS)
check_PROGRAMS = $(TEST_PROGS)
TEST_PROGS += test_alarm test_player test_list_entry test_util test_alarm glade_view test_gconf_recursive

View File

@@ -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>

View File

@@ -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"

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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[] = {

View File

@@ -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_

View File

@@ -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>

View File

@@ -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_