Change package name to 'alarm-clock-applet' to avoid name conflicts.

Update to reflect the new location of gnome-default-applications.xml.
Bump to version 0.2.6.

configure.ac

@@ -2,9 +2,9 @@ dnl ***************************************************************************
 dnl *** configure.ac for ALARM-CLOCK                                        ***
 dnl ***************************************************************************
 
-AC_INIT([Alarm Clock], [0.2.3],
+AC_INIT([Alarm Clock], [0.2.6],
 		[Johannes H. Jensen <joh@pseudoberries.com>],
-		[alarm-clock])
+		[alarm-clock-applet])
 		
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE
@@ -129,8 +129,6 @@ iconsdir="${datadir}/icons"
 AC_SUBST(iconsdir)
 pixmapsdir="${datadir}/pixmaps"
 AC_SUBST(pixmapsdir)
-pkgdatadir="${datadir}/alarm-clock"
-AC_SUBST(pkgdatadir)
 gladedir="${pkgdatadir}/glade"
 AC_SUBST(gladedir)
 soundsdir="${datadir}/sounds"

src/AlarmClock.server.in

@@ -1,6 +1,6 @@
 <oaf_info>
 <oaf_server iid="OAFIID:AlarmClock_Factory" type="exe"
-			location="@BINDIR@/alarm-clock-applet">
+			location="@LIBEXECDIR@/alarm-clock-applet">
 
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:Bonobo/GenericFactory:1.0"/>
@@ -23,4 +23,4 @@
 	<oaf_attribute name="panel:category" type="string" value="Accessories"/>
 	<oaf_attribute name="panel:icon" type="string" value="alarm-clock.png"/>
 </oaf_server>
-</oaf_info>
+</oaf_info>

src/Makefile.am

@@ -13,7 +13,7 @@ INCLUDES =						\
 	$(LIBNOTIFY_CFLAGS)			\
 	-I$(includedir) 			
 
-bin_PROGRAMS = alarm-clock-applet
+libexec_PROGRAMS = alarm-clock-applet
 
 alarm_clock_applet_SOURCES = alarm-applet.c alarm-applet.h	\
 							 player.c player.h				\
@@ -39,7 +39,7 @@ server_in_files = AlarmClock.server.in
 server_DATA     = $(server_in_files:.server.in=.server)
 
 $(server_DATA): $(server_in_files)
-	sed -e "s|\@BINDIR\@|$(bindir)|" $< > $@
+	sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
 
 uidir = $(gladedir)
 ui_DATA = ui/alarm-clock.glade
@@ -142,4 +142,4 @@ uninstall-local: uninstall-schemas uninstall-icons uninstall-data
 EXTRA_DIST += $(server_in_files)	\
 			  $(schemas_DATA)		\
 		      $(icons)				\
-		      $(ui_DATA)			
+		      $(ui_DATA)			

src/alarm-applet.c

@@ -252,6 +252,7 @@ alarm_applet_apps_load (AlarmApplet *applet)
 	// from gnome-control-center
 	filename = g_build_filename (DATADIR,
 								 "gnome-control-center",
+								 "default-apps",
 					 			 "gnome-default-applications.xml",
 					 			 NULL);
 	
@@ -427,7 +428,7 @@ alarm_applet_alarms_load (AlarmApplet *applet)
 	}
 	
 	/* Fetch list of alarms */
-	applet->alarms = alarm_get_list (applet->gconf_dir);
+	applet->alarms = alarm_get_list (ALARM_GCONF_DIR);
 }
 
 void

src/alarm-applet.h

@@ -67,6 +67,7 @@ void alarm_applet_clear_alarms (AlarmApplet *applet);
 #define ALARM_ICON 		 "alarm-clock"
 #define TIMER_ICON		 "alarm-timer"
 #define SNOOZE_ICON		 "alarm-snooze"
+#define ALARM_GCONF_DIR	 "/apps/alarm-clock"
 #define ALARM_SCHEMA_DIR "/schemas/apps/alarm_clock/prefs"
 #define ALARM_UI_XML	 GNOME_GLADEDIR "/alarm-clock.glade"
 #define ALARM_SOUNDS_DIR GNOME_SOUNDSDIR

src/alarm-gconf.c

@@ -119,7 +119,7 @@ alarm_applet_gconf_global_change (GConfClient  *client,
 	 * 
 	 * Here we extract {something}
 	 */
-	dir = applet->gconf_dir;
+	dir = ALARM_GCONF_DIR;
 	len = strlen (entry->key);
 	str = g_string_new ("");
 	
@@ -175,7 +175,7 @@ alarm_applet_gconf_global_change (GConfClient  *client,
 			/*
 			 * 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);
 			
@@ -226,14 +226,11 @@ alarm_applet_gconf_init (AlarmApplet *applet)
 	 * Listen for changes to the alarms.
 	 * We want to know when an alarm is added and removed.
 	 */
-	key = panel_applet_get_preferences_key(PANEL_APPLET (applet->parent));
 	applet->listeners [2] =
 		gconf_client_notify_add (
-				client, key,
+				client, ALARM_GCONF_DIR,
 				(GConfClientNotifyFunc) alarm_applet_gconf_global_change,
 				applet, NULL, NULL);
-	g_free (key);
-	
 	
 }
 

src/alarms-list.c

@@ -296,7 +296,7 @@ add_button_cb (GtkButton *button, gpointer data)
 	/*
 	 * 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

src/edit-alarm.c

@@ -189,6 +189,12 @@ alarm_settings_update_notify_type (AlarmSettingsDialog *dialog)
 		
 		// Disable others
 		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;
 	default:
 		// NOTIFY_SOUND

src/icons/alarm-clock.svg

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
-   xmlns:ns="http://creativecommons.org/ns#"
    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:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
@@ -14,16 +13,23 @@
    height="22"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    version="1.0"
    inkscape:export-filename="/home/joh/workspace/alarm-applet/src/icons/alarm-clock.64.png"
    inkscape:export-xdpi="261.82001"
    inkscape:export-ydpi="261.82001"
-   sodipodi:docname="alarm22x22.svg"
+   sodipodi:docname="alarm-clock.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    sodipodi:docbase="/home/joh/Pictures">
   <defs
      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
        id="linearGradient14243">
       <stop
@@ -98,10 +104,11 @@
      height="24px"
      inkscape:snap-bbox="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
        type="xygrid"
        id="grid2293" />
@@ -109,12 +116,12 @@
   <metadata
      id="metadata7">
     <rdf:RDF>
-      <ns:Work
+      <cc:Work
          rdf:about="">
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </ns:Work>
+      </cc:Work>
       <cc:Work
          rdf:about="">
         <dc:format>image/svg+xml</dc:format>
@@ -170,11 +177,6 @@
        inkscape:export-filename="/home/lasse/Bilder/alarm-applet/path14231.png"
        inkscape:export-xdpi="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
        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"

src/tests/Makefile.am

@@ -12,9 +12,9 @@ INCLUDES =						\
 	-I$(includedir) 			\
 	-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_LDADD =				\
@@ -56,4 +56,4 @@ glade_view_LDADD =				\
 test_gconf_recursive_SOURCES = test_gconf_recursive.c
 test_gconf_recursive_LDADD =	\
 	$(GLIB_LIBS)				\
-	$(GCONF_LIBS)
+	$(GCONF_LIBS)

src/tests/glade_view.c

@@ -47,16 +47,11 @@ int main (int argc, char **argv)
 		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 */
 	GtkWidget *checkbox_label = gtk_bin_get_child (GTK_BIN (checkbox));
 	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();
 	
 	return 0;

src/tests/test_alarm.c

@@ -26,7 +26,7 @@
 #include <glib.h>
 #include <string.h>
 
-#define GCONF_DIR "/apps/alarm-clock"
+#define GCONF_DIR "/apps/alarm-clock/test"
 
 /* Fixture */
 typedef struct {
@@ -330,7 +330,7 @@ test_alarm_notify (AlarmFixture *fix,
 	//
 	g_object_set (alarm,
 				  "notify_type", ALARM_NOTIFY_SOUND,
-				  "sound_file", "file:///usr/share/sounds/generic.wav",
+				  "sound_file", "file:///usr/share/sounds/question.wav",
 				  "sound_repeat", FALSE,
 				  NULL);
 	

src/tests/test_list_entry.c

@@ -52,7 +52,7 @@ int main (void)
 	alarm_list_entry_free(entry);
 	
 	// 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);
 	g_print ("VFSResult: %s, MIME: %s\n", gnome_vfs_result_to_string(result), mime);
 	alarm_list_entry_free (entry);

src/ui/alarm-clock.glade

@@ -311,7 +311,7 @@
                     <property name="visible">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="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="numeric">True</property>
                   </widget>
@@ -335,7 +335,7 @@
                     <property name="visible">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="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="numeric">True</property>
                   </widget>
@@ -360,7 +360,7 @@
                     <property name="visible">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="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="numeric">True</property>
                   </widget>
@@ -575,7 +575,7 @@
                 <property name="visible">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="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="numeric">True</property>
               </widget>