changes are made in alarm-notify.glade and alarm-notify-dialog.c to make sure

that the description part of the alarm dialog comes in a scroll window and
thus fixing #314550

svn path=/trunk/; revision=30632

2 files changed, 35 insertions, 28 deletions

diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.c b/calendar/gui/alarm-notify/alarm-notify-dialog.c
index 667ba997b0..c9fd68029e 100644
--- a/calendar/gui/alarm-notify/alarm-notify-dialog.c
+++ b/calendar/gui/alarm-notify/alarm-notify-dialog.c
@@ -32,6 +32,7 @@
 #include <gtk/gtksignal.h>
 #include <gtk/gtkscrolledwindow.h>
 #include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 #include <libgnome/gnome-i18n.h>
 #if 0 
 #  include <libgnomeui/gnome-winhints.h>
@@ -295,7 +296,6 @@ notified_alarms_dialog_new (void)
 	return na;
 }
  
- 
 /**
  * add_alarm_to_notified_alarms_dialog:
  * @na: Pointer to the dialog-info
@@ -393,6 +393,11 @@ static void
 fill_in_labels (AlarmNotify *an, const gchar *summary, const gchar *description, 
 		const gchar *location, time_t occur_start, time_t occur_end)
 {
-	gtk_label_set_text (GTK_LABEL (an->description), description);
-	gtk_label_set_text (GTK_LABEL (an->location), location);		  
+	GtkTextTagTable *table = gtk_text_tag_table_new ();
+	GtkTextBuffer *buffer =  gtk_text_buffer_new (table);
+	gtk_text_buffer_set_text (buffer, description, -1);
+	gtk_text_view_set_buffer (GTK_TEXT_VIEW (an->description), buffer);
+	gtk_label_set_text (GTK_LABEL (an->location), location);
+	g_object_unref (table);
+	g_object_unref (buffer);
 }
diff --git a/calendar/gui/alarm-notify/alarm-notify.glade b/calendar/gui/alarm-notify/alarm-notify.glade
index a258714bb9..97bdea1f45 100644
--- a/calendar/gui/alarm-notify/alarm-notify.glade
+++ b/calendar/gui/alarm-notify/alarm-notify.glade
@@ -126,32 +126,34 @@
 		      <property name="homogeneous">False</property>
 		      <property name="spacing">12</property>
 
-		      <child>
-			<widget class="GtkLabel" id="description-label">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">description of appointment</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">True</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">True</property>
-			  <property name="selectable">True</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
+			<child>
+				<widget class="GtkScrolledWindow" id="description">
+		                  <property name="visible">True</property>
+		                  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                		  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+		                  <property name="shadow_type">GTK_SHADOW_IN</property>
+		                  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+		                 <child>
+                		    <widget class="GtkTextView" id="description-label">
+		                      <property name="visible">True</property>
+                		      <property name="can_focus">True</property>
+		                      <property name="editable">False</property>
+		                      <property name="overwrite">False</property>
+		                      <property name="accepts_tab">True</property>
+		                      <property name="justification">GTK_JUSTIFY_LEFT</property>
+		                      <property name="wrap_mode">GTK_WRAP_WORD</property>
+		                      <property name="cursor_visible">True</property>
+		                      <property name="pixels_above_lines">0</property>
+		                      <property name="pixels_below_lines">0</property>
+		                      <property name="pixels_inside_wrap">0</property>
+		                      <property name="left_margin">0</property>
+		                      <property name="right_margin">0</property>
+		                      <property name="indent">0</property>
+		                      <property name="text" translatable="yes"></property>
+		                    </widget>
+                		  </child>
+				</widget>
 		      </child>
-
 		      <child>
 			<widget class="GtkTable" id="table1">
 			  <property name="visible">True</property>