3 Commits
0.2.3 ... 0.2.4

Author SHA1 Message Date
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
6 changed files with 8 additions and 15 deletions

View File

@@ -2,7 +2,7 @@ dnl ***************************************************************************
dnl *** configure.ac for ALARM-CLOCK *** dnl *** configure.ac for ALARM-CLOCK ***
dnl *************************************************************************** dnl ***************************************************************************
AC_INIT([Alarm Clock], [0.2.3], AC_INIT([Alarm Clock], [0.2.4],
[Johannes H. Jensen <joh@pseudoberries.com>], [Johannes H. Jensen <joh@pseudoberries.com>],
[alarm-clock]) [alarm-clock])

View File

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

View File

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

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

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

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