10 Commits
0.2.2 ... 0.2.5

Author SHA1 Message Date
Johannes H. Jensen
95778fc0ac 0.2.5 release. 2009-04-19 18:28:12 +02:00
Johannes H. Jensen
1389d6a506 Fix tests so that they succeed on intrepid.
Remove non-GTest sources from TEST_PROGS.
Fix bug LP:#330092.
2009-02-22 22:41:10 +01:00
Johannes H. Jensen
b2fb6ec7e0 Stop playing preview sound when changing notification to "Start application".
Patch by Arnaud Soyez <weboide@codealpha.net>.
Fix bug LP:#332756.
2009-02-22 21:58:26 +01:00
Johannes H. Jensen
5be98106d5 Remove "ghost" object from alarm-clock.svg icon. 2008-10-04 22:36:00 +02:00
Johannes H. Jensen
ff5326df22 Set page_size to 0 in edit-alarm dialog. (Workaround for GNOME bug #307963) 2008-08-29 00:49:06 +02:00
Johannes H. Jensen
1cba177277 0.2.4 release. 2008-08-28 00:51:49 +02:00
Johannes H. Jensen
fe74f4b470 Store alarms in a global GConf directory: /apps/alarm-clock (LP: #261877) 2008-08-27 17:19:03 +02:00
Johannes H. Jensen
ba8b925263 Remove old checkbox code. 2008-08-27 16:05:37 +02:00
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
37 changed files with 106 additions and 96 deletions

View File

@@ -2,8 +2,8 @@ dnl ***************************************************************************
dnl *** configure.ac for ALARM-CLOCK *** dnl *** configure.ac for ALARM-CLOCK ***
dnl *************************************************************************** dnl ***************************************************************************
AC_INIT([Alarm Clock], [0.2.2], AC_INIT([Alarm Clock], [0.2.5],
[Johannes H. Jensen <joh@deworks.net>], [Johannes H. Jensen <joh@pseudoberries.com>],
[alarm-clock]) [alarm-clock])
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(config.h)

View File

@@ -1,7 +1,7 @@
/* /*
* alarm-applet.c -- Alarm Clock applet bootstrap * 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 * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * 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. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* *
* Authors: * Authors:
* Johannes H. Jensen <joh@deworks.net> * Johannes H. Jensen <joh@pseudoberries.com>
*/ */
#include "alarm-applet.h" #include "alarm-applet.h"
@@ -427,7 +427,7 @@ alarm_applet_alarms_load (AlarmApplet *applet)
} }
/* Fetch list of alarms */ /* Fetch list of alarms */
applet->alarms = alarm_get_list (applet->gconf_dir); applet->alarms = alarm_get_list (ALARM_GCONF_DIR);
} }
void void
@@ -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::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::active", G_CALLBACK (alarm_active_changed), applet);
g_signal_connect (alarm, "notify::time", 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 void
@@ -463,6 +465,11 @@ alarm_applet_alarms_remove (AlarmApplet *applet, Alarm *alarm)
alarm_applet_upcoming_alarm_update (applet); 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 * Dereference alarm
*/ */

View File

@@ -1,7 +1,7 @@
/* /*
* alarm-applet.h -- Alarm Clock applet bootstrap * 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 * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * 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. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* *
* Authors: * Authors:
* Johannes H. Jensen <joh@deworks.net> * Johannes H. Jensen <joh@pseudoberries.com>
*/ */
#ifndef ALARMAPPLET_H_ #ifndef ALARMAPPLET_H_
@@ -67,6 +67,7 @@ void alarm_applet_clear_alarms (AlarmApplet *applet);
#define ALARM_ICON "alarm-clock" #define ALARM_ICON "alarm-clock"
#define TIMER_ICON "alarm-timer" #define TIMER_ICON "alarm-timer"
#define SNOOZE_ICON "alarm-snooze" #define SNOOZE_ICON "alarm-snooze"
#define ALARM_GCONF_DIR "/apps/alarm-clock"
#define ALARM_SCHEMA_DIR "/schemas/apps/alarm_clock/prefs" #define ALARM_SCHEMA_DIR "/schemas/apps/alarm_clock/prefs"
#define ALARM_UI_XML GNOME_GLADEDIR "/alarm-clock.glade" #define ALARM_UI_XML GNOME_GLADEDIR "/alarm-clock.glade"
#define ALARM_SOUNDS_DIR GNOME_SOUNDSDIR #define ALARM_SOUNDS_DIR GNOME_SOUNDSDIR

View File

@@ -1,7 +1,7 @@
/* /*
* alarm-gconf.c -- GConf routines * 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 * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * 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. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* *
* Authors: * Authors:
* Johannes H. Jensen <joh@deworks.net> * Johannes H. Jensen <joh@pseudoberries.com>
*/ */
#include <time.h> #include <time.h>
@@ -119,7 +119,7 @@ alarm_applet_gconf_global_change (GConfClient *client,
* *
* Here we extract {something} * Here we extract {something}
*/ */
dir = applet->gconf_dir; dir = ALARM_GCONF_DIR;
len = strlen (entry->key); len = strlen (entry->key);
str = g_string_new (""); str = g_string_new ("");
@@ -175,7 +175,7 @@ alarm_applet_gconf_global_change (GConfClient *client,
/* /*
* Add to list * Add to list
*/ */
a = alarm_new (applet->gconf_dir, id); a = alarm_new (ALARM_GCONF_DIR, id);
g_debug ("\tADD alarm #%d %p", id, a); g_debug ("\tADD alarm #%d %p", id, a);
@@ -226,14 +226,11 @@ alarm_applet_gconf_init (AlarmApplet *applet)
* Listen for changes to the alarms. * Listen for changes to the alarms.
* We want to know when an alarm is added and removed. * We want to know when an alarm is added and removed.
*/ */
key = panel_applet_get_preferences_key(PANEL_APPLET (applet->parent));
applet->listeners [2] = applet->listeners [2] =
gconf_client_notify_add ( gconf_client_notify_add (
client, key, client, ALARM_GCONF_DIR,
(GConfClientNotifyFunc) alarm_applet_gconf_global_change, (GConfClientNotifyFunc) alarm_applet_gconf_global_change,
applet, NULL, NULL); applet, NULL, NULL);
g_free (key);
} }

View File

@@ -1,7 +1,7 @@
/* /*
* alarm-gconf.h -- GConf routines * 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 * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * 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. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* *
* Authors: * Authors:
* Johannes H. Jensen <joh@deworks.net> * Johannes H. Jensen <joh@pseudoberries.com>
*/ */
#ifndef ALARM_GCONF_H_ #ifndef ALARM_GCONF_H_

View File

@@ -1,7 +1,7 @@
/* /*
* alarm.c -- Core alarm functionality * 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 * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * 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. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* *
* Authors: * Authors:
* Johannes H. Jensen <joh@deworks.net> * Johannes H. Jensen <joh@pseudoberries.com>
*/ */
#include <stdio.h> #include <stdio.h>
@@ -1434,6 +1434,8 @@ alarm_dispose (GObject *object)
parent->dispose (object); parent->dispose (object);
alarm_gconf_disconnect (alarm); alarm_gconf_disconnect (alarm);
alarm_timer_remove(alarm);
alarm_clear (alarm);
} }
/* /*

View File

@@ -1,7 +1,7 @@
/* /*
* alarm.h -- Core alarm functionality * 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 * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * 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. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* *
* Authors: * Authors:
* Johannes H. Jensen <joh@deworks.net> * Johannes H. Jensen <joh@pseudoberries.com>
*/ */
#ifndef ALARM_H_ #ifndef ALARM_H_

View File

@@ -1,7 +1,7 @@
/* /*
* alarms-list.d -- List alarms dialog * 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 * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * 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. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* *
* Authors: * Authors:
* Johannes H. Jensen <joh@deworks.net> * Johannes H. Jensen <joh@pseudoberries.com>
*/ */
#include "alarms-list.h" #include "alarms-list.h"
@@ -296,7 +296,7 @@ add_button_cb (GtkButton *button, gpointer data)
/* /*
* Create new alarm, will fall back to defaults. * Create new alarm, will fall back to defaults.
*/ */
alarm = alarm_new (applet->gconf_dir, -1); alarm = alarm_new (ALARM_GCONF_DIR, -1);
/* /*
* Set first sound / app in list * Set first sound / app in list

View File

@@ -1,7 +1,7 @@
/* /*
* alarms-list.h -- List alarms dialog * 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 * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * 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. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* *
* Authors: * Authors:
* Johannes H. Jensen <joh@deworks.net> * Johannes H. Jensen <joh@pseudoberries.com>
*/ */
#ifndef ALARMSLIST_H_ #ifndef ALARMSLIST_H_

View File

@@ -1,7 +1,7 @@
/* /*
* edit-alarm.c -- Alarm settings dialog * 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 * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * 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. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* *
* Authors: * Authors:
* Johannes H. Jensen <joh@deworks.net> * Johannes H. Jensen <joh@pseudoberries.com>
*/ */
#include "edit-alarm.h" #include "edit-alarm.h"
@@ -189,6 +189,12 @@ alarm_settings_update_notify_type (AlarmSettingsDialog *dialog)
// Disable others // Disable others
g_object_set (dialog->notify_sound_box, "sensitive", FALSE, NULL); g_object_set (dialog->notify_sound_box, "sensitive", FALSE, NULL);
if (dialog->player && dialog->player->state == MEDIA_PLAYER_PLAYING) {
// Stop preview player
media_player_stop (dialog->player);
}
break; break;
default: default:
// NOTIFY_SOUND // NOTIFY_SOUND

View File

@@ -1,7 +1,7 @@
/* /*
* edit-alarm.h -- Alarm settings dialog * 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 * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * 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. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* *
* Authors: * Authors:
* Johannes H. Jensen <joh@deworks.net> * Johannes H. Jensen <joh@pseudoberries.com>
*/ */
#ifndef EDITALARM_H_ #ifndef EDITALARM_H_

Binary file not shown.

Before

Width:  |  Height:  |  Size: 906 B

After

Width:  |  Height:  |  Size: 904 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

View File

@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) --> <!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg <svg
xmlns:ns="http://creativecommons.org/ns#"
xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://web.resource.org/cc/" xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg"
@@ -14,16 +13,23 @@
height="22" height="22"
id="svg2" id="svg2"
sodipodi:version="0.32" sodipodi:version="0.32"
inkscape:version="0.45.1" inkscape:version="0.46"
version="1.0" version="1.0"
inkscape:export-filename="/home/joh/workspace/alarm-applet/src/icons/alarm-clock.64.png" inkscape:export-filename="/home/joh/workspace/alarm-applet/src/icons/alarm-clock.64.png"
inkscape:export-xdpi="261.82001" inkscape:export-xdpi="261.82001"
inkscape:export-ydpi="261.82001" inkscape:export-ydpi="261.82001"
sodipodi:docname="alarm22x22.svg" sodipodi:docname="alarm-clock.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape" inkscape:output_extension="org.inkscape.output.svg.inkscape"
sodipodi:docbase="/home/joh/Pictures"> sodipodi:docbase="/home/joh/Pictures">
<defs <defs
id="defs4"> id="defs4">
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 11 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="22 : 11 : 1"
inkscape:persp3d-origin="11 : 7.3333333 : 1"
id="perspective35" />
<linearGradient <linearGradient
id="linearGradient14243"> id="linearGradient14243">
<stop <stop
@@ -98,10 +104,11 @@
height="24px" height="24px"
inkscape:snap-bbox="true" inkscape:snap-bbox="true"
inkscape:snap-guide="true" inkscape:snap-guide="true"
inkscape:window-width="1680" inkscape:window-width="1024"
inkscape:window-height="1022" inkscape:window-height="698"
inkscape:window-x="1680" inkscape:window-x="0"
inkscape:window-y="28"> inkscape:window-y="47"
showgrid="false">
<inkscape:grid <inkscape:grid
type="xygrid" type="xygrid"
id="grid2293" /> id="grid2293" />
@@ -109,12 +116,12 @@
<metadata <metadata
id="metadata7"> id="metadata7">
<rdf:RDF> <rdf:RDF>
<ns:Work <cc:Work
rdf:about=""> rdf:about="">
<dc:format>image/svg+xml</dc:format> <dc:format>image/svg+xml</dc:format>
<dc:type <dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</ns:Work> </cc:Work>
<cc:Work <cc:Work
rdf:about=""> rdf:about="">
<dc:format>image/svg+xml</dc:format> <dc:format>image/svg+xml</dc:format>
@@ -170,11 +177,6 @@
inkscape:export-filename="/home/lasse/Bilder/alarm-applet/path14231.png" inkscape:export-filename="/home/lasse/Bilder/alarm-applet/path14231.png"
inkscape:export-xdpi="98.18" inkscape:export-xdpi="98.18"
inkscape:export-ydpi="98.18" /> inkscape:export-ydpi="98.18" />
<path
style="opacity:0.26530612;fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 21.051798,0.6490485 C 22.051798,0.6490485 22.047682,0.4239611 22.797682,1.1739611 C 23.547682,1.9239611 23.499371,1.9750874 23.499371,2.9750874 C 23.499371,3.9750874 23.129138,4.5 23.129138,4.5 C 23.129138,4.5 22.584944,3.7361359 22.084944,2.9861359 C 21.584944,2.2361359 21.084944,1.9861359 21.084944,1.9861359 L 19.814148,0.9529903 C 19.814148,0.9529903 20.051798,0.6490485 21.051798,0.6490485 z"
id="path14223"
sodipodi:nodetypes="czzczccz" />
<path <path
style="fill:#ea8686;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" style="fill:#ea8686;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 2.4545455,2.5656566 C 3.7272727,1.2929293 5,2.5656566 5,2.5656566 C 3.9857955,2.8937816 2.8636363,4.0656566 2.4545455,5.1111111 C 2.4545455,5.1111111 1.1818182,3.8383838 2.4545455,2.5656566 z" d="M 2.4545455,2.5656566 C 3.7272727,1.2929293 5,2.5656566 5,2.5656566 C 3.9857955,2.8937816 2.8636363,4.0656566 2.4545455,5.1111111 C 2.4545455,5.1111111 1.1818182,3.8383838 2.4545455,2.5656566 z"

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 9.8 KiB

View File

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

View File

@@ -1,7 +1,7 @@
/* /*
* list-entry.h -- Simple data structure to hold name, data and icon. * 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 * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * 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. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* *
* Authors: * Authors:
* Johannes H. Jensen <joh@deworks.net> * Johannes H. Jensen <joh@pseudoberries.com>
*/ */
#ifndef LISTENTRY_H_ #ifndef LISTENTRY_H_

View File

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

View File

@@ -1,7 +1,7 @@
/* /*
* player.h - Simple media player based on GStreamer * 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 * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * 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. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* *
* Authors: * Authors:
* Johannes H. Jensen <joh@deworks.net> * Johannes H. Jensen <joh@pseudoberries.com>
*/ */
#ifndef PLAYER_H_ #ifndef PLAYER_H_

View File

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

View File

@@ -1,7 +1,7 @@
/* /*
* prefs.h -- Alarm Clock global preferences * 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 * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * 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. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* *
* Authors: * Authors:
* Johannes H. Jensen <joh@deworks.net> * Johannes H. Jensen <joh@pseudoberries.com>
*/ */
#ifndef PREFS_H_ #ifndef PREFS_H_

View File

@@ -12,9 +12,9 @@ INCLUDES = \
-I$(includedir) \ -I$(includedir) \
-I$(top_srcdir)/src -I$(top_srcdir)/src
check_PROGRAMS = $(TEST_PROGS) check_PROGRAMS = $(TEST_PROGS) test_player test_list_entry test_util glade_view test_gconf_recursive
TEST_PROGS += test_alarm test_player test_list_entry test_util test_alarm glade_view test_gconf_recursive TEST_PROGS += test_alarm
test_player_SOURCES = $(top_srcdir)/src/player.c $(top_srcdir)/src/player.h test_player.c test_player_SOURCES = $(top_srcdir)/src/player.c $(top_srcdir)/src/player.h test_player.c
test_player_LDADD = \ test_player_LDADD = \

View File

@@ -1,7 +1,7 @@
/* /*
* glade_view.c -- Test utility for running a glade file. * 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 * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * 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. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* *
* Authors: * Authors:
* Johannes H. Jensen <joh@deworks.net> * Johannes H. Jensen <joh@pseudoberries.com>
*/ */
#include <gtk/gtk.h> #include <gtk/gtk.h>
@@ -47,16 +47,11 @@ int main (int argc, char **argv)
return 1; return 1;
} }
GtkWidget *checkbox = glade_xml_get_widget(ui, "repeat-check"); GtkWidget *checkbox = glade_xml_get_widget(ui, "snooze-check");
/* you can't do this from glade */ /* you can't do this from glade */
GtkWidget *checkbox_label = gtk_bin_get_child (GTK_BIN (checkbox)); GtkWidget *checkbox_label = gtk_bin_get_child (GTK_BIN (checkbox));
g_object_set (G_OBJECT (checkbox_label), "use_markup", TRUE, NULL); g_object_set (G_OBJECT (checkbox_label), "use_markup", TRUE, NULL);
checkbox = glade_xml_get_widget(ui, "snooze-check");
/* you can't do this from glade */
checkbox_label = gtk_bin_get_child (GTK_BIN (checkbox));
g_object_set (G_OBJECT (checkbox_label), "use_markup", TRUE, NULL);
gtk_main(); gtk_main();
return 0; return 0;

View File

@@ -1,7 +1,7 @@
/* /*
* test_alarm.c -- Alarm test suite * 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 * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * 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. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* *
* Authors: * Authors:
* Johannes H. Jensen <joh@deworks.net> * Johannes H. Jensen <joh@pseudoberries.com>
*/ */
#include "alarm.h" #include "alarm.h"
@@ -26,7 +26,7 @@
#include <glib.h> #include <glib.h>
#include <string.h> #include <string.h>
#define GCONF_DIR "/apps/alarm-clock" #define GCONF_DIR "/apps/alarm-clock/test"
/* Fixture */ /* Fixture */
typedef struct { typedef struct {
@@ -330,7 +330,7 @@ test_alarm_notify (AlarmFixture *fix,
// //
g_object_set (alarm, g_object_set (alarm,
"notify_type", ALARM_NOTIFY_SOUND, "notify_type", ALARM_NOTIFY_SOUND,
"sound_file", "file:///usr/share/sounds/generic.wav", "sound_file", "file:///usr/share/sounds/question.wav",
"sound_repeat", FALSE, "sound_repeat", FALSE,
NULL); NULL);

View File

@@ -1,7 +1,7 @@
/* /*
* test_gconf_recursive.c -- Test utility for recursively unsetting a gconf dir. * 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 * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * 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. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* *
* Authors: * Authors:
* Johannes H. Jensen <joh@deworks.net> * Johannes H. Jensen <joh@pseudoberries.com>
*/ */
#include <glib.h> #include <glib.h>

View File

@@ -1,7 +1,7 @@
/* /*
* test_list_entry.c -- Test for AlarmListEntry * 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 * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * 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. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* *
* Authors: * Authors:
* Johannes H. Jensen <joh@deworks.net> * Johannes H. Jensen <joh@pseudoberries.com>
*/ */
#include <glib.h> #include <glib.h>
@@ -52,7 +52,7 @@ int main (void)
alarm_list_entry_free(entry); alarm_list_entry_free(entry);
// Test alarm list entry from file // Test alarm list entry from file
entry = alarm_list_entry_new_file("file:///usr/share/sounds/login.wav", &result, &mime); entry = alarm_list_entry_new_file("file:///usr/share/sounds/question.wav", &result, &mime);
entry_dump (entry); entry_dump (entry);
g_print ("VFSResult: %s, MIME: %s\n", gnome_vfs_result_to_string(result), mime); g_print ("VFSResult: %s, MIME: %s\n", gnome_vfs_result_to_string(result), mime);
alarm_list_entry_free (entry); alarm_list_entry_free (entry);

View File

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

View File

@@ -1,7 +1,7 @@
/* /*
* glade_util.c -- Test for alarm utilities. * 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 * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * 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. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* *
* Authors: * Authors:
* Johannes H. Jensen <joh@deworks.net> * Johannes H. Jensen <joh@pseudoberries.com>
*/ */
#include <time.h> #include <time.h>

View File

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

View File

@@ -1,7 +1,7 @@
/* /*
* ui.h - Alarm Clock applet UI routines * 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 * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * 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. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* *
* Authors: * Authors:
* Johannes H. Jensen <joh@deworks.net> * Johannes H. Jensen <joh@pseudoberries.com>
*/ */
#ifndef UI_H_ #ifndef UI_H_

View File

@@ -311,7 +311,7 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="adjustment">0 0 23 1 10 10</property> <property name="adjustment">0 0 23 1 10 0</property>
<property name="climb_rate">1</property> <property name="climb_rate">1</property>
<property name="numeric">True</property> <property name="numeric">True</property>
</widget> </widget>
@@ -335,7 +335,7 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="adjustment">0 0 59 1 10 10</property> <property name="adjustment">0 0 59 1 10 0</property>
<property name="climb_rate">1</property> <property name="climb_rate">1</property>
<property name="numeric">True</property> <property name="numeric">True</property>
</widget> </widget>
@@ -360,7 +360,7 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="adjustment">0 0 59 1 10 10</property> <property name="adjustment">0 0 59 1 10 0</property>
<property name="climb_rate">1</property> <property name="climb_rate">1</property>
<property name="numeric">True</property> <property name="numeric">True</property>
</widget> </widget>
@@ -575,7 +575,7 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="adjustment">0 0 99 1 10 10</property> <property name="adjustment">0 0 99 1 10 0</property>
<property name="climb_rate">1</property> <property name="climb_rate">1</property>
<property name="numeric">True</property> <property name="numeric">True</property>
</widget> </widget>

View File

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

View File

@@ -1,7 +1,7 @@
/* /*
* util.h -- Misc utilities * 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 * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * 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. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* *
* Authors: * Authors:
* Johannes H. Jensen <joh@deworks.net> * Johannes H. Jensen <joh@pseudoberries.com>
*/ */
#ifndef UTIL_H_ #ifndef UTIL_H_