# HG changeset patch
# User nenolod
# Date 1161979979 25200
# Node ID 8b343e9684b5cdb86b8b1abf57bcb1a6bcefe9a0
# Parent  603d5ff9d4bdae5e61984d23741015761fcfe274
[svn] - fixes from Christian Birchinger <joker -at- gentoo.org>

diff -r 603d5ff9d4bd -r 8b343e9684b5 ChangeLog
--- a/ChangeLog	Fri Oct 27 12:52:59 2006 -0700
+++ b/ChangeLog	Fri Oct 27 13:12:59 2006 -0700
@@ -1,3 +1,11 @@
+2006-10-27 19:52:59 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [266]
+  - fix ChangeLog (i forgot to add asheldon to the changelog definition file, oops)
+  
+  trunk/ChangeLog |    2 +-
+  1 file changed, 1 insertion(+), 1 deletion(-)
+
+
 2006-10-27 19:50:20 +0000  Aaron Sheldon <asheldon@uiuc.edu>
   revision [264]
   Fixes compiler warnings that "Joker" was talking about in #audacious.
diff -r 603d5ff9d4bd -r 8b343e9684b5 src/alarm/Makefile
--- a/src/alarm/Makefile	Fri Oct 27 12:52:59 2006 -0700
+++ b/src/alarm/Makefile	Fri Oct 27 13:12:59 2006 -0700
@@ -11,7 +11,7 @@
 
 SOURCES = alarm.c interface.c
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(BEEP_DEFINES) -I../../intl -I../.. -DGTK_ENABLE_BROKEN
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(BEEP_DEFINES) -I../../intl -I../..
 
 OBJECTS = ${SOURCES:.c=.o}
 
diff -r 603d5ff9d4bd -r 8b343e9684b5 src/alarm/interface.c
--- a/src/alarm/interface.c	Fri Oct 27 12:52:59 2006 -0700
+++ b/src/alarm/interface.c	Fri Oct 27 13:12:59 2006 -0700
@@ -371,6 +371,8 @@
   GtkWidget *frame16;
   GtkWidget *scrolledwindow1;
   GtkWidget *text1;
+  GtkTextBuffer *text1buffer;
+  GtkTextIter iter;
   GtkWidget *label86;
   GtkWidget *dialog_action_area5;
   GtkWidget *hbox20;
@@ -1349,14 +1351,16 @@
   gtk_container_add (GTK_CONTAINER (frame16), scrolledwindow1);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow1), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
 
-  text1 = gtk_text_new (NULL, NULL);
+  text1 = gtk_text_view_new();
+  text1buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW (text1));
+  gtk_text_buffer_get_iter_at_offset (text1buffer, &iter, 0);
   gtk_widget_set_name (text1, "text1");
   gtk_widget_ref (text1);
   gtk_object_set_data_full (GTK_OBJECT (config_dialog), "text1", text1,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_widget_show (text1);
   gtk_container_add (GTK_CONTAINER (scrolledwindow1), text1);
-  gtk_text_insert (GTK_TEXT_VIEW (text1), NULL, NULL, NULL,
+  gtk_text_buffer_insert (text1buffer, &iter,
                    "Time\n  Alarm at: \n    The time for the alarm to come on.\n\n  Quiet After: \n    Stop alarm after this amount of time.\n       (if the wakeup dialog is not closed)\n\n\nDays\n  Day:\n    Select the days for the alarm to activate.\n\n  Time:\n    Choose the time for the alarm on each day,\n    or select the toggle button to use the default\n    time.\n\n\nVolume\n  Fading: \n    Fade the volume up to the chosen volume \n    for this amount of time.\n\n  Start at: \n    Start fading from this volume.\n\n  Final: \n    The volume to stop fading at.  If the fading\n    time is 0 then set volume to this and start\n    playing.\n\n\nOptions:\n  Additional Command:\n    Run this command at the alarm time.\n\n  Playlist: \n    Load this playlist for playing songs from \n    (must have .m3u extension).  If no playlist\n    is given then the songs which are currently\n    in the list will be used.\n    The URL of an mp3/ogg stream can also be\n    entered here, but loading of playlists from\n    URLs is not currently supported by xmms.\n\n  Reminder:\n    Display a reminder when the alarm goes off,\n    type the reminder in the box and turn on the\n    toggle button if you want it to be shown.", 1143);
 
   label86 = gtk_label_new ("Help");
diff -r 603d5ff9d4bd -r 8b343e9684b5 src/alarm/interface.h
--- a/src/alarm/interface.h	Fri Oct 27 12:52:59 2006 -0700
+++ b/src/alarm/interface.h	Fri Oct 27 13:12:59 2006 -0700
@@ -7,6 +7,8 @@
 GtkWidget* create_playlist_fileselection (void);
 GtkWidget* create_warning_dialog (void);
 GtkWidget* create_config_dialog (void);
+GtkWidget* create_reminder_dialog (gchar *reminder_msg);
+
 /*
  * vi:ai:expandtab:ts=2 sts=2 shiftwidth=2:nowrap:
  */