evolution r37283 - in branches/kill-bonobo: calendar/modules composer e-util widgets/misc

[mbarnes svn gnome org]

Author: mbarnes
Date: Tue Feb 17 15:59:18 2009
New Revision: 37283
URL: http://svn.gnome.org/viewvc/evolution?rev=37283&view=rev

Log:
Miscellaneous bug fixes.
Kill e-util/e-corba-utils.[ch].


Removed:
   branches/kill-bonobo/e-util/e-corba-utils.c
   branches/kill-bonobo/e-util/e-corba-utils.h
Modified:
   branches/kill-bonobo/calendar/modules/e-cal-shell-module.c
   branches/kill-bonobo/composer/e-composer-actions.c
   branches/kill-bonobo/e-util/Makefile.am
   branches/kill-bonobo/widgets/misc/e-icon-entry.c

Modified: branches/kill-bonobo/calendar/modules/e-cal-shell-module.c
==============================================================================
--- branches/kill-bonobo/calendar/modules/e-cal-shell-module.c	(original)
+++ branches/kill-bonobo/calendar/modules/e-cal-shell-module.c	Tue Feb 17 15:59:18 2009
@@ -398,7 +398,7 @@
 	{ "event-new",
 	  "appointment-new",
 	  NC_("New", "_Appointment"),
-	  "<Control>a",
+	  "<Shift><Control>a",
 	  N_("Create a new appointment"),
 	  G_CALLBACK (action_event_new_cb) },
 
@@ -412,7 +412,7 @@
 	{ "event-meeting-new",
 	  "stock_new-meeting",
 	  NC_("New", "M_eeting"),
-	  "<Control>e",
+	  "<Shift><Control>e",
 	  N_("Create a new meeting request"),
 	  G_CALLBACK (action_event_new_cb) }
 };

Modified: branches/kill-bonobo/composer/e-composer-actions.c
==============================================================================
--- branches/kill-bonobo/composer/e-composer-actions.c	(original)
+++ branches/kill-bonobo/composer/e-composer-actions.c	Tue Feb 17 15:59:18 2009
@@ -22,7 +22,6 @@
 #include <fcntl.h>
 #include <e-util/e-error.h>
 #include <mail/em-event.h>
-#include <mail/em-composer-utils.h>
 
 #include "misc/e-charset-picker.h"
 
@@ -328,7 +327,10 @@
 action_new_message_cb (GtkAction *action,
                        EMsgComposer *composer)
 {
-	em_utils_compose_new_message (NULL);
+	GtkWidget *widget;
+
+	widget = e_msg_composer_new ();
+	gtk_widget_show (widget);
 }
 
 static void

Modified: branches/kill-bonobo/e-util/Makefile.am
==============================================================================
--- branches/kill-bonobo/e-util/Makefile.am	(original)
+++ branches/kill-bonobo/e-util/Makefile.am	Tue Feb 17 15:59:18 2009
@@ -46,7 +46,6 @@
 	e-categories-config.h			\
 	e-config.h				\
 	e-config-listener.h			\
-	e-corba-utils.h				\
 	e-cursor.h				\
 	e-dialog-utils.h			\
 	e-dialog-widgets.h			\
@@ -89,7 +88,6 @@
 	e-categories-config.c			\
 	e-config-listener.c			\
 	e-config.c				\
-	e-corba-utils.c				\
 	e-cursor.c				\
 	e-dialog-utils.c			\
 	e-dialog-widgets.c			\

Modified: branches/kill-bonobo/widgets/misc/e-icon-entry.c
==============================================================================
--- branches/kill-bonobo/widgets/misc/e-icon-entry.c	(original)
+++ branches/kill-bonobo/widgets/misc/e-icon-entry.c	Tue Feb 17 15:59:18 2009
@@ -75,7 +75,7 @@
 	proxy = gtk_event_box_new ();
 	gtk_event_box_set_visible_window (GTK_EVENT_BOX (proxy), FALSE);
 	gtk_container_set_border_width (GTK_CONTAINER (proxy), 2);
-	gtk_action_connect_proxy (action, proxy);
+	gtk_widget_show (proxy);
 
 	widget = gtk_action_create_icon (action, GTK_ICON_SIZE_MENU);
 	gtk_container_add (GTK_CONTAINER (proxy), widget);