aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@src.gnome.org>2009-02-17 23:59:18 +0800
committerMatthew Barnes <mbarnes@src.gnome.org>2009-02-17 23:59:18 +0800
commit7ed5f59771262651ee8b0d29a123e43a6ac0b6c6 (patch)
treedfdd3b5b9b049361f6eeb92ca449c3be83434d31
parentbf3f62476491b492b9d37aee6051e8f1b16ce655 (diff)
downloadgsoc2013-evolution-7ed5f59771262651ee8b0d29a123e43a6ac0b6c6.tar.gz
gsoc2013-evolution-7ed5f59771262651ee8b0d29a123e43a6ac0b6c6.tar.zst
gsoc2013-evolution-7ed5f59771262651ee8b0d29a123e43a6ac0b6c6.zip
Miscellaneous bug fixes.
Kill e-util/e-corba-utils.[ch]. svn path=/branches/kill-bonobo/; revision=37283
-rw-r--r--calendar/modules/e-cal-shell-module.c4
-rw-r--r--composer/e-composer-actions.c6
-rw-r--r--e-util/Makefile.am2
-rw-r--r--e-util/e-corba-utils.c43
-rw-r--r--e-util/e-corba-utils.h31
-rw-r--r--widgets/misc/e-icon-entry.c2
6 files changed, 7 insertions, 81 deletions
diff --git a/calendar/modules/e-cal-shell-module.c b/calendar/modules/e-cal-shell-module.c
index 16f84e8f82..0fa0336177 100644
--- a/calendar/modules/e-cal-shell-module.c
+++ b/calendar/modules/e-cal-shell-module.c
@@ -398,7 +398,7 @@ static GtkActionEntry item_entries[] = {
{ "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 @@ static GtkActionEntry item_entries[] = {
{ "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) }
};
diff --git a/composer/e-composer-actions.c b/composer/e-composer-actions.c
index 71065d6996..01c05ecc61 100644
--- a/composer/e-composer-actions.c
+++ b/composer/e-composer-actions.c
@@ -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 @@ static void
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
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index 8131a820cd..be155b52bd 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -46,7 +46,6 @@ eutilinclude_HEADERS = \
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 @@ libeutil_la_SOURCES = \
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 \
diff --git a/e-util/e-corba-utils.c b/e-util/e-corba-utils.c
deleted file mode 100644
index 0288602a7e..0000000000
--- a/e-util/e-corba-utils.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
- *
- *
- * Authors:
- * Ettore Perazzoli <ettore@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "e-corba-utils.h"
-
-
-const CORBA_char *
-e_safe_corba_string (const char *s)
-{
- if (s == NULL)
- return (CORBA_char *) "";
-
- return s;
-}
-
-CORBA_char *
-e_safe_corba_string_dup (const char *s)
-{
- return CORBA_string_dup (e_safe_corba_string (s));
-}
diff --git a/e-util/e-corba-utils.h b/e-util/e-corba-utils.h
deleted file mode 100644
index 979237929d..0000000000
--- a/e-util/e-corba-utils.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
- *
- *
- * Authors:
- * Ettore Perazzoli <ettore@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- */
-
-#ifndef E_CORBA_UTILS_H
-#define E_CORBA_UTILS_H
-
-#include <orbit/orbit.h>
-
-const CORBA_char *e_safe_corba_string (const char *s);
-CORBA_char *e_safe_corba_string_dup (const char *s);
-
-#endif
diff --git a/widgets/misc/e-icon-entry.c b/widgets/misc/e-icon-entry.c
index 86e42488a7..cfcce8f8c5 100644
--- a/widgets/misc/e-icon-entry.c
+++ b/widgets/misc/e-icon-entry.c
@@ -75,7 +75,7 @@ icon_entry_create_proxy (GtkAction *action)
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);