Index: clock.c
===================================================================
RCS file: /cvs/gnome/gnome-panel/applets/clock/clock.c,v
retrieving revision 1.171
diff -u -p -r1.171 clock.c
--- clock.c	10 Aug 2005 17:27:19 -0000	1.171
+++ clock.c	18 Aug 2005 10:40:38 -0000
@@ -339,9 +339,7 @@ update_clock (ClockData * cd)
 		tm = localtime (&cd->current_time);
 
 	if (cd->format == CLOCK_FORMAT_UNIX) {
-		if ((cd->orient == PANEL_APPLET_ORIENT_LEFT ||
-		     cd->orient == PANEL_APPLET_ORIENT_RIGHT) &&
-		    cd->size >= GNOME_Vertigo_PANEL_MEDIUM) {
+		if (cd->size >= GNOME_Vertigo_PANEL_MEDIUM) {
 			g_snprintf (hour, sizeof(hour), "%lu\n%05lu",
 				    (unsigned long)(cd->current_time / 100000L),
 				    (unsigned long)(cd->current_time % 100000L));
@@ -1589,7 +1587,6 @@ create_clock_widget (ClockData *cd)
 				  G_CALLBACK (unfix_size),
 				  cd);
 	gtk_label_set_justify (GTK_LABEL (clock), GTK_JUSTIFY_CENTER);
-	gtk_label_set_line_wrap (GTK_LABEL (clock), TRUE);
 	gtk_widget_show (clock);
 
 	toggle = gtk_toggle_button_new ();
@@ -1619,6 +1616,14 @@ create_clock_widget (ClockData *cd)
 	cd->props = NULL;
 
 	cd->orient = panel_applet_get_orient (PANEL_APPLET (cd->applet));
+	// Initialise label orientation
+	if (cd->orient == PANEL_APPLET_ORIENT_LEFT)
+		gtk_label_set_angle (GTK_LABEL (cd->clockw), 270);
+	else if (cd->orient == PANEL_APPLET_ORIENT_RIGHT)
+		gtk_label_set_angle (GTK_LABEL (cd->clockw), 90);
+	else
+		gtk_label_set_angle (GTK_LABEL (cd->clockw), 0);
+
 	cd->size = panel_applet_get_size (PANEL_APPLET (cd->applet));
 
 	g_signal_connect (G_OBJECT(clock), "destroy",
@@ -1640,7 +1645,14 @@ applet_change_orient (PanelApplet       
 		      ClockData         *cd)
 {
 	cd->orient = orient;
-
+	
+  if (cd->orient == PANEL_APPLET_ORIENT_LEFT)
+		gtk_label_set_angle (GTK_LABEL (cd->clockw), 270);
+	else if (cd->orient == PANEL_APPLET_ORIENT_RIGHT)
+		gtk_label_set_angle (GTK_LABEL (cd->clockw), 90);
+	else
+		gtk_label_set_angle (GTK_LABEL (cd->clockw), 0);
+	
         unfix_size (cd);
 	update_clock (cd);
         update_popup (cd);
@@ -2222,7 +2234,7 @@ fill_clock_applet (PanelApplet *applet)
 	gtk_window_set_default_icon_name ("clock");
 	gtk_widget_show (cd->applet);
 
-	/* FIXME: Update this comment. */
+	/* FIXME: Update this comment: now NOT called initially */
 	/* we have to bind change_orient before we do applet_widget_add
 	   since we need to get an initial change_orient signal to set our
 	   initial oriantation, and we get that during the _add call */
