0.2.3 bugfix release.

Remove timer and stop player on alarm dispose.

AUTHORS

@@ -1,2 +1,3 @@
 Johannes H. Jensen <joh@deworks.net>
 
+Artwork by Lasse Gullvåg Sætre <lassegs@gmail.com>

COPYING

@@ -0,0 +1,339 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.

INSTALL

@@ -0,0 +1,2 @@
+
+Please see the README file for installation instructions.

Makefile.am

@@ -1,7 +1,5 @@
 include $(top_srcdir)/Makefile.decl
 
 SUBDIRS = src
-DIST_SUBDIRS = src \
-			   src/tests
 
 EXTRA_DIST += autogen.sh

configure.ac

@@ -2,8 +2,8 @@ dnl ***************************************************************************
 dnl *** configure.ac for ALARM-CLOCK                                        ***
 dnl ***************************************************************************
 
-AC_INIT([Alarm Clock], [0.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)
@@ -162,4 +162,4 @@ echo "Configure summary:"
 echo "  Notifications (libnotify): $HAVE_LIBNOTIFY"
 echo 
 echo "*************************************************"
-echo
+echo

src/alarm-applet.c

@@ -1,3 +1,26 @@
+/*
+ * alarm-applet.c -- Alarm Clock applet bootstrap
+ * 
+ * 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
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * 
+ * Authors:
+ * 		Johannes H. Jensen <joh@pseudoberries.com>
+ */
+
 #include "alarm-applet.h"
 
 #include "alarm.h"
@@ -347,9 +370,9 @@ alarm_active_changed (GObject *object,
 			alarm_applet_upcoming_alarm_update (applet);
 			alarm_applet_label_update (applet);
 			alarm_applet_icon_update (applet);
-			
-			return;
 		}
+		
+		return;
 	}
 	
 	if (!applet->upcoming_alarm || alarm->timestamp < applet->upcoming_alarm->timestamp) {
@@ -415,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
@@ -440,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
 	 */

src/alarm-applet.h

@@ -1,3 +1,26 @@
+/*
+ * alarm-applet.h -- Alarm Clock applet bootstrap
+ * 
+ * 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
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * 
+ * Authors:
+ * 		Johannes H. Jensen <joh@pseudoberries.com>
+ */
+
 #ifndef ALARMAPPLET_H_
 #define ALARMAPPLET_H_
 
@@ -48,6 +71,7 @@ void alarm_applet_clear_alarms (AlarmApplet *applet);
 #define ALARM_UI_XML	 GNOME_GLADEDIR "/alarm-clock.glade"
 #define ALARM_SOUNDS_DIR GNOME_SOUNDSDIR
 #define ALARM_DEF_LABEL	 _("No alarms")
+#define ALARM_DEF_SNOOZE 9
 
 #ifndef VERSION
 #define VERSION "0.1"

src/alarm-clock-applet.pod

@@ -0,0 +1,51 @@
+=head1 NAME
+
+alarm-clock-applet - Alarm Clock applet for GNOME 
+
+=head1 SYNOPSIS
+
+alarm-clock-applet
+
+=head1 DESCRIPTION
+
+Alarm Clock is a fully-featured alarm clock appelt for the GNOME panel.
+It's easy to use yet powerful with support for multiple repeatable alarms, 
+as well as snoozing and a flexible notification system.
+
+Two types of alarms are supported: Alarm Clocks and Timers.
+
+Notification is done by either playing a sound or launching an application.
+
+Please see http://alarm-clock.pseudoberries.com/ for more information.
+
+=head1 OPTIONS
+
+=over 8
+
+=item B<--help>
+
+Show help message
+
+=item B<--version>
+
+Displays information about the currently installed version and exists.
+
+=head1 BUGS
+
+Please report bugs at https://bugs.launchpad.net/alarm-clock/
+
+=head1 AUTHORS
+
+B<Alarm Clock> was written by Johannes H. Jensen <joh@pseudoberries.com>.
+
+=head1 COPYRIGHT
+
+This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2, or (at your option) any
+later version.
+
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+=cut

src/alarm-gconf.c

@@ -1,7 +1,24 @@
 /*
+ * alarm-gconf.c -- GConf routines
  * 
- * ALARM APPLET Gconf callbacks and utilities.
+ * 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
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * 
+ * Authors:
+ * 		Johannes H. Jensen <joh@pseudoberries.com>
  */
 
 #include <time.h>

src/alarm-gconf.h

@@ -1,3 +1,26 @@
+/*
+ * alarm-gconf.h -- GConf routines
+ * 
+ * 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
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * 
+ * Authors:
+ * 		Johannes H. Jensen <joh@pseudoberries.com>
+ */
+
 #ifndef ALARM_GCONF_H_
 #define ALARM_GCONF_H_
 

src/alarm.c

@@ -1,5 +1,24 @@
 /*
- * Copyright/Licensing information.
+ * alarm.c -- Core alarm functionality
+ * 
+ * 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
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * 
+ * Authors:
+ * 		Johannes H. Jensen <joh@pseudoberries.com>
  */
 
 #include <stdio.h>
@@ -55,6 +74,7 @@ struct _AlarmPrivate
 	guint gconf_listener;
 	guint timer_id;
 	MediaPlayer *player;
+	guint player_timer_id;
 };
 
 
@@ -1414,6 +1434,8 @@ alarm_dispose (GObject *object)
 		parent->dispose (object);
 	
 	alarm_gconf_disconnect (alarm);
+	alarm_timer_remove(alarm);
+	alarm_clear (alarm);
 }
 
 /*
@@ -1798,6 +1820,18 @@ alarm_player_state_cb (MediaPlayer *player, MediaPlayerState state, gpointer dat
 	}
 }
 
+static gboolean
+alarm_player_timeout (gpointer data)
+{
+	Alarm *alarm = ALARM (data);
+	
+	g_debug ("[%p] #%d player_timeout", alarm, alarm->id);
+	
+	alarm_player_stop (alarm);
+	
+	return FALSE;
+}
+
 
 /**
  * Play sound via gstreamer
@@ -1819,6 +1853,11 @@ alarm_player_start (Alarm *alarm)
 	media_player_start (priv->player);
 	
 	g_debug ("[%p] #%d player_start...", alarm, alarm->id);
+	
+	/*
+	 * Add stop timeout
+	 */
+	priv->player_timer_id = g_timeout_add_seconds(ALARM_SOUND_TIMEOUT, alarm_player_timeout, alarm);
 }
 
 /**
@@ -1831,6 +1870,11 @@ alarm_player_stop (Alarm *alarm)
 	
 	if (priv->player != NULL) {
 		media_player_stop (priv->player);
+		
+		if (priv->player_timer_id > 0) {
+			g_source_remove (priv->player_timer_id);
+			priv->player_timer_id = 0;
+		}
 	}
 }
 

src/alarm.h

@@ -1,5 +1,24 @@
 /*
- * Copyright/Licensing information.
+ * alarm.h -- Core alarm functionality
+ * 
+ * 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
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * 
+ * Authors:
+ * 		Johannes H. Jensen <joh@pseudoberries.com>
  */
 
 #ifndef ALARM_H_
@@ -134,6 +153,12 @@ typedef enum {
 #define ALARM_GCONF_DIR_PREFIX		"alarm"
 #define ALARM_GCONF_SCHEMA_DIR		"/schemas/apps/alarm_clock/alarm"
 
+/*
+ * Player backoff timeout.
+ * We will stop the player automatically after 20 minutes.
+ */
+#define ALARM_SOUND_TIMEOUT			(60 * 20)
+
 /*
  * Function prototypes.
  */

src/alarms-list.c

@@ -1,3 +1,26 @@
+/*
+ * alarms-list.d -- List alarms dialog
+ * 
+ * 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
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * 
+ * Authors:
+ * 		Johannes H. Jensen <joh@pseudoberries.com>
+ */
+
 #include "alarms-list.h"
 #include "edit-alarm.h"
 

src/alarms-list.h

@@ -1,3 +1,26 @@
+/*
+ * alarms-list.h -- List alarms dialog
+ * 
+ * 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
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * 
+ * Authors:
+ * 		Johannes H. Jensen <joh@pseudoberries.com>
+ */
+
 #ifndef ALARMSLIST_H_
 #define ALARMSLIST_H_
 

src/edit-alarm.c

@@ -1,3 +1,26 @@
+/*
+ * edit-alarm.c -- Alarm settings dialog
+ * 
+ * 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
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * 
+ * Authors:
+ * 		Johannes H. Jensen <joh@pseudoberries.com>
+ */
+
 #include "edit-alarm.h"
 #include "alarm-applet.h"
 #include "alarm.h"
@@ -516,7 +539,7 @@ snooze_check_changed_cb (GtkToggleButton *togglebutton, gpointer data)
 	AlarmSettingsDialog *dialog = (AlarmSettingsDialog *)data;
 	
 	if (gtk_toggle_button_get_active (togglebutton) && dialog->alarm->snooze == 0) {
-		g_object_set (dialog->alarm, "snooze", 5, NULL);
+		g_object_set (dialog->alarm, "snooze", ALARM_DEF_SNOOZE, NULL);
 	} else if (!gtk_toggle_button_get_active (togglebutton) && dialog->alarm->snooze > 0) {
 		g_object_set (dialog->alarm, "snooze", 0, NULL);
 	}

src/edit-alarm.h

@@ -1,3 +1,26 @@
+/*
+ * edit-alarm.h -- Alarm settings dialog
+ * 
+ * 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
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * 
+ * Authors:
+ * 		Johannes H. Jensen <joh@pseudoberries.com>
+ */
+
 #ifndef EDITALARM_H_
 #define EDITALARM_H_
 

src/list-entry.c

@@ -1,6 +1,24 @@
 /*
- * ALARM APPLET List Entry
+ * list-entry.c -- Simple data structure to hold name, data and icon.
  * 
+ * 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
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * 
+ * Authors:
+ * 		Johannes H. Jensen <joh@pseudoberries.com>
  */
 
 #include <string.h>

src/list-entry.h

@@ -1,3 +1,26 @@
+/*
+ * list-entry.h -- Simple data structure to hold name, data and icon.
+ * 
+ * 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
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * 
+ * Authors:
+ * 		Johannes H. Jensen <joh@pseudoberries.com>
+ */
+
 #ifndef LISTENTRY_H_
 #define LISTENTRY_H_
 

src/player.c

@@ -1,6 +1,24 @@
-/**
- * ALARM APPLET Media player
+/*
+ * player.c - Simple media player based on GStreamer
  * 
+ * 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
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * 
+ * Authors:
+ * 		Johannes H. Jensen <joh@pseudoberries.com>
  */
 
 #include <gst/gst.h>

src/player.h

@@ -1,3 +1,26 @@
+/*
+ * player.h - Simple media player based on GStreamer
+ * 
+ * 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
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * 
+ * Authors:
+ * 		Johannes H. Jensen <joh@pseudoberries.com>
+ */
+
 #ifndef PLAYER_H_
 #define PLAYER_H_
 

src/prefs.c

@@ -1,3 +1,26 @@
+/*
+ * prefs.c -- Alarm Clock global preferences
+ * 
+ * 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
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * 
+ * Authors:
+ * 		Johannes H. Jensen <joh@pseudoberries.com>
+ */
+
 #include "prefs.h"
 
 void

src/prefs.h

@@ -1,3 +1,26 @@
+/*
+ * prefs.h -- Alarm Clock global preferences
+ * 
+ * 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
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * 
+ * Authors:
+ * 		Johannes H. Jensen <joh@pseudoberries.com>
+ */
+
 #ifndef PREFS_H_
 #define PREFS_H_
 

src/tests/Makefile.am

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

src/tests/glade_view.c

@@ -1,3 +1,26 @@
+/*
+ * glade_view.c -- Test utility for running a glade file.
+ * 
+ * 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
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * 
+ * Authors:
+ * 		Johannes H. Jensen <joh@pseudoberries.com>
+ */
+
 #include <gtk/gtk.h>
 #include <glade/glade.h>
 

src/tests/test_alarm.c

@@ -1,3 +1,26 @@
+/*
+ * test_alarm.c -- Alarm test suite
+ * 
+ * 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
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * 
+ * Authors:
+ * 		Johannes H. Jensen <joh@pseudoberries.com>
+ */
+
 #include "alarm.h"
 #include <time.h>
 #include <glib.h>

src/tests/test_gconf_recursive.c

@@ -1,3 +1,26 @@
+/*
+ * test_gconf_recursive.c -- Test utility for recursively unsetting a gconf dir.
+ * 
+ * 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
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * 
+ * Authors:
+ * 		Johannes H. Jensen <joh@pseudoberries.com>
+ */
+
 #include <glib.h>
 #include <gconf/gconf-client.h>
 

src/tests/test_list_entry.c

@@ -1,3 +1,26 @@
+/*
+ * test_list_entry.c -- Test for AlarmListEntry
+ * 
+ * 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
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * 
+ * Authors:
+ * 		Johannes H. Jensen <joh@pseudoberries.com>
+ */
+
 #include <glib.h>
 
 #include "list-entry.h"

src/tests/test_player.c

@@ -1,3 +1,26 @@
+/*
+ * test_player.c -- Test utility for the MediaPlayer system.
+ * 
+ * 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
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * 
+ * Authors:
+ * 		Johannes H. Jensen <joh@pseudoberries.com>
+ */
+
 #include <glib.h>
 
 #include "player.h"

src/tests/test_util.c

@@ -1,3 +1,26 @@
+/*
+ * glade_util.c -- Test for alarm utilities.
+ * 
+ * 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
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * 
+ * Authors:
+ * 		Johannes H. Jensen <joh@pseudoberries.com>
+ */
+
 #include <time.h>
 #include <glib.h>
 

src/tests/testutils.h

@@ -1,22 +0,0 @@
-#ifndef TESTUTILS_H_
-#define TESTUTILS_H_
-
-/* TODO: These no longer work, should move to the new stuff in gtestutils.h */
-
-#define ASSERT_EQUALS(v1,v2)			g_assert (v1 == v2)
-
-#define ASSERT_STR_EQUALS(s1,s2)		g_assert (strcmp(s1,s2) == 0)
-
-#define ASSERT_PROP_EQUALS(o,key,eq,type)	do {										\
-												type val;								\
-												g_object_get ((o), (key), &val, NULL);	\
-												ASSERT_EQUALS(val,eq);					\
-											} while (0)
-
-#define ASSERT_PROP_STR_EQUALS(o,key,eq)	do {										\
-												gchar *val;								\
-												g_object_get ((o), (key), &val, NULL);	\
-												ASSERT_STR_EQUALS (val, eq);			\
-											} while (0)
-
-#endif /*TESTUTILS_H_*/

src/ui.c

@@ -1,6 +1,31 @@
+/*
+ * ui.c - Alarm Clock applet UI routines
+ * 
+ * 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
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * 
+ * Authors:
+ * 		Johannes H. Jensen <joh@pseudoberries.com>
+ */
+
 #include <time.h>
 #include <string.h>
+#ifdef HAVE_LIBNOTIFY
 #include <libnotify/notify.h>
+#endif
 
 #include "alarm-applet.h"
 #include "ui.h"
@@ -464,6 +489,7 @@ alarm_applet_notification_display (AlarmApplet *applet, Alarm *alarm)
 	
 	applet->notify = notify_notification_new (_("Alarm!"), message, icon, GTK_WIDGET (applet->icon));
 	
+	notify_notification_set_timeout (applet->notify, NOTIFY_EXPIRES_NEVER);
 	notify_notification_add_action (applet->notify, "clear", "Clear", alarm_applet_notification_action_cb, alarm, NULL);
 	
 	if (alarm->snooze) {
@@ -632,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[] = {

src/ui.h

@@ -1,3 +1,26 @@
+/*
+ * ui.h - Alarm Clock applet UI routines
+ * 
+ * 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
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * 
+ * Authors:
+ * 		Johannes H. Jensen <joh@pseudoberries.com>
+ */
+
 #ifndef UI_H_
 #define UI_H_
 

src/ui/alarm-clock.glade

@@ -4,7 +4,7 @@
 <glade-interface>
   <widget class="GtkDialog" id="preferences">
     <property name="width_request">290</property>
-    <property name="title" translatable="yes">Alarm Applet Preferences</property>
+    <property name="title" translatable="yes">Alarm Clock Preferences</property>
     <property name="resizable">False</property>
     <property name="icon_name">alarm-clock</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
@@ -251,6 +251,7 @@
     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
     <property name="border_width">5</property>
     <property name="title" translatable="yes">Edit alarm</property>
+    <property name="resizable">False</property>
     <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
     <property name="destroy_with_parent">True</property>
     <property name="icon_name">alarm-clock</property>

src/util.c

@@ -1,6 +1,24 @@
 /*
- * ALARM APPLET Utilities
+ * util.c -- Misc utilities
  * 
+ * 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
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * 
+ * Authors:
+ * 		Johannes H. Jensen <joh@pseudoberries.com>
  */
 
 #include <string.h>

src/util.h

@@ -1,6 +1,24 @@
 /*
- * ALARM APPLET Utilities
+ * util.h -- Misc utilities
  * 
+ * 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
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * 
+ * Authors:
+ * 		Johannes H. Jensen <joh@pseudoberries.com>
  */
 
 #ifndef UTIL_H_