Remove owner field

2000-08-24  JP Rosevear  <jpr@helixcode.com>

	* gui/event-editor-dialog.glade: Remove owner field

	* gui/event-editor.c (clear_widgets): Forget about owner field
	(get_widgets): ditto
	(fill_widgets): ditto

svn path=/trunk/; revision=5002

4 files changed, 25 insertions, 82 deletions

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 731d6eefb5..823e851ab3 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,5 +1,13 @@
 2000-08-24  JP Rosevear  <jpr@helixcode.com>
 
+	* gui/event-editor-dialog.glade: Remove owner field
+
+	* gui/event-editor.c (clear_widgets): Forget about owner field
+	(get_widgets): ditto
+	(fill_widgets): ditto
+
+2000-08-24  JP Rosevear  <jpr@helixcode.com>
+
 	* gui/calendar-model.c (calendar_model_initialize_value): Handle
 	summary field
 	(calendar_model_value_is_empty): ditto
diff --git a/calendar/gui/event-editor-dialog.glade b/calendar/gui/event-editor-dialog.glade
index 8e32ab57d1..5267bda069 100644
--- a/calendar/gui/event-editor-dialog.glade
+++ b/calendar/gui/event-editor-dialog.glade
@@ -65,7 +65,7 @@
 	<widget>
 	  <class>GtkTable</class>
 	  <name>table5</name>
-	  <rows>2</rows>
+	  <rows>1</rows>
 	  <columns>2</columns>
 	  <homogeneous>False</homogeneous>
 	  <row_spacing>4</row_spacing>
@@ -77,21 +77,24 @@
 	  </child>
 
 	  <widget>
-	    <class>GtkEntry</class>
-	    <name>general-owner</name>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
+	    <class>GtkLabel</class>
+	    <name>label13</name>
+	    <label>_Summary:</label>
+	    <justify>GTK_JUSTIFY_CENTER</justify>
+	    <wrap>False</wrap>
+	    <xalign>7.45058e-09</xalign>
+	    <yalign>0.5</yalign>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	    <default_focus_target>general-summary</default_focus_target>
 	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>2</right_attach>
+	      <left_attach>0</left_attach>
+	      <right_attach>1</right_attach>
 	      <top_attach>0</top_attach>
 	      <bottom_attach>1</bottom_attach>
 	      <xpad>0</xpad>
 	      <ypad>0</ypad>
-	      <xexpand>True</xexpand>
+	      <xexpand>False</xexpand>
 	      <yexpand>False</yexpand>
 	      <xshrink>False</xshrink>
 	      <yshrink>False</yshrink>
@@ -111,65 +114,11 @@
 	    <child>
 	      <left_attach>1</left_attach>
 	      <right_attach>2</right_attach>
-	      <top_attach>1</top_attach>
-	      <bottom_attach>2</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>True</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label41</name>
-	    <label>_Summary:</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>7.45058e-09</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <focus_target>general-summary</focus_target>
-	    <child>
-	      <left_attach>0</left_attach>
-	      <right_attach>1</right_attach>
-	      <top_attach>1</top_attach>
-	      <bottom_attach>2</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>False</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label13</name>
-	    <label>_Owner:</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>7.45058e-09</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <focus_target>general-owner</focus_target>
-	    <child>
-	      <left_attach>0</left_attach>
-	      <right_attach>1</right_attach>
 	      <top_attach>0</top_attach>
 	      <bottom_attach>1</bottom_attach>
 	      <xpad>0</xpad>
 	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
+	      <xexpand>True</xexpand>
 	      <yexpand>False</yexpand>
 	      <xshrink>False</xshrink>
 	      <yshrink>False</yshrink>
diff --git a/calendar/gui/event-editor-dialog.glade.h b/calendar/gui/event-editor-dialog.glade.h
index d921f3746a..57638f7f78 100644
--- a/calendar/gui/event-editor-dialog.glade.h
+++ b/calendar/gui/event-editor-dialog.glade.h
@@ -6,7 +6,6 @@
 
 gchar *s = N_("event-editor-dialog");
 gchar *s = N_("_Summary:");
-gchar *s = N_("_Owner:");
 gchar *s = N_("Time");
 gchar *s = N_("Start time:");
 gchar *s = N_("End time:");
diff --git a/calendar/gui/event-editor.c b/calendar/gui/event-editor.c
index ff4a6e7e29..60ff650553 100644
--- a/calendar/gui/event-editor.c
+++ b/calendar/gui/event-editor.c
@@ -47,7 +47,6 @@ typedef struct {
 
 	GtkWidget *app;
 
-	GtkWidget *general_owner;
 	GtkWidget *general_summary;
 
 	GtkWidget *start_time;
@@ -332,7 +331,6 @@ get_widgets (EventEditor *ee)
 
 	priv->app = GW ("event-editor-dialog");
 
-	priv->general_owner = GW ("general-owner");
 	priv->general_summary = GW ("general-summary");
 
 	priv->start_time = GW ("start-time");
@@ -402,8 +400,7 @@ get_widgets (EventEditor *ee)
 
 #undef GW
 
-	return (priv->general_owner
-		&& priv->general_summary
+	return (priv->general_summary
 		&& priv->start_time
 		&& priv->end_time
 		&& priv->all_day_event
@@ -608,9 +605,7 @@ clear_widgets (EventEditor *ee)
 
 	now = time (NULL);
 
-	/* Owner, summary */
-
-	e_dialog_editable_set (priv->general_owner, _("?"));
+	/* Summary, description */
 	e_dialog_editable_set (priv->general_summary, NULL);
 	e_dialog_editable_set (priv->description, NULL);
 
@@ -708,14 +703,6 @@ fill_widgets (EventEditor *ee)
 	if (!priv->comp)
 		return;
 
-	/* Owner, summary */
-#warning "FIX ME"
-	/* kludge until I figure out where to get the organizer */
-/*  	e_dialog_editable_set (priv->general_owner, */
-/*  			       priv->ico->organizer->addr ? */
-/*  			       priv->ico->organizer->addr : _("?")); */
-	e_dialog_editable_set (priv->general_owner, _("?"));
-
 	cal_component_get_summary (priv->comp, &text);
 	e_dialog_editable_set (priv->general_summary, text.value);