create button properly

2003-04-07  JP Rosevear  <jpr@ximian.com>

	* gui/dialogs/event-page.glade: create button properly

	* gui/itip-utils.c (comp_server_send): for errors other than busy,
	we want to email the results

	* pcs/cal-backend.c (cal_backend_ref_categories): insert the new
	category in the category list as well
	(idle_notify_categories_changed): reset idle id

svn path=/trunk/; revision=20726

4 files changed, 17 insertions, 36 deletions

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 31d7729ab2..714cb687f5 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,14 @@
+2003-04-07  JP Rosevear  <jpr@ximian.com>
+
+	* gui/dialogs/event-page.glade: create button properly
+
+	* gui/itip-utils.c (comp_server_send): for errors other than busy,
+	we want to email the results
+
+	* pcs/cal-backend.c (cal_backend_ref_categories): insert the new
+	category in the category list as well
+	(idle_notify_categories_changed): reset idle id
+
 2003-04-07  Not Zed  <NotZed@Ximian.com>
  
  	Fixes #40252
diff --git a/calendar/gui/dialogs/event-page.glade b/calendar/gui/dialogs/event-page.glade
index 6693c8af65..ea02dc9ba4 100644
--- a/calendar/gui/dialogs/event-page.glade
+++ b/calendar/gui/dialogs/event-page.glade
@@ -560,22 +560,6 @@
 	      <property name="label" translatable="yes">_Contacts...</property>
 	      <property name="use_underline">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
-
-	      <child>
-		<widget class="GtkLabel" id="label59">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">_Contacts...</property>
-		  <property name="use_underline">True</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_CENTER</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">4</property>
-		  <property name="ypad">0</property>
-		</widget>
-	      </child>
 	    </widget>
 	    <packing>
 	      <property name="padding">0</property>
@@ -606,22 +590,6 @@
 	      <property name="label" translatable="yes">Ca_tegories...</property>
 	      <property name="use_underline">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
-
-	      <child>
-		<widget class="GtkLabel" id="label60">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Ca_tegories...</property>
-		  <property name="use_underline">True</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_CENTER</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">4</property>
-		  <property name="ypad">0</property>
-		</widget>
-	      </child>
 	    </widget>
 	    <packing>
 	      <property name="padding">0</property>
diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c
index ab32ac79c1..7db8456209 100644
--- a/calendar/gui/itip-utils.c
+++ b/calendar/gui/itip-utils.c
@@ -533,7 +533,7 @@ comp_server_send (CalComponentItipMethod method, CalComponent *comp, CalClient *
 	CalClientSendResult result;
 	icalcomponent *top_level, *new_top_level = NULL;
 	char error_msg[256];
-	gboolean retval = FALSE;
+	gboolean retval = TRUE;
 	
 	top_level = comp_toplevel_with_zones (method, comp, client, zones);
 	result = cal_client_send_object (client, top_level, &new_top_level, users, error_msg);
@@ -545,8 +545,6 @@ comp_server_send (CalComponentItipMethod method, CalComponent *comp, CalClient *
 		icalcomponent_remove_component (new_top_level, ical_comp);
 		cal_component_set_icalcomponent (comp, ical_comp);
 		icalcomponent_free (new_top_level);
-		
-		retval = TRUE;
 	} else if (result == CAL_CLIENT_SEND_BUSY) {
 		e_notice (NULL, GTK_MESSAGE_ERROR, error_msg);
 
@@ -828,7 +826,7 @@ itip_send_comp (CalComponentItipMethod method, CalComponent *send_comp,
 	CORBA_Object *composer_server;
 	CalComponent *comp = NULL;
 	icalcomponent *top_level = NULL;
-	GList *users;
+	GList *users = NULL;
 	GNOME_Evolution_Composer_RecipientList *to_list = NULL;
 	GNOME_Evolution_Composer_RecipientList *cc_list = NULL;
 	GNOME_Evolution_Composer_RecipientList *bcc_list = NULL;
diff --git a/calendar/pcs/cal-backend.c b/calendar/pcs/cal-backend.c
index 765d873f79..261466ebaa 100644
--- a/calendar/pcs/cal-backend.c
+++ b/calendar/pcs/cal-backend.c
@@ -1149,6 +1149,9 @@ idle_notify_categories_changed (gpointer data)
 		notify_categories_changed (backend);
 		g_hash_table_foreach_remove (priv->changed_categories, prune_changed_categories, NULL);
 	}
+
+	priv->category_idle_id = 0;
+	
 	return FALSE;
 }
 
@@ -1191,6 +1194,7 @@ cal_backend_ref_categories (CalBackend *backend, GSList *categories)
 				c = g_new (CalBackendCategory, 1);
 				c->name = g_strdup (name);
 				c->refcount = 1;
+				g_hash_table_insert (priv->categories, c->name, c);
 				g_hash_table_insert (priv->changed_categories, c->name, c);
 			}
 		}