[evolution/kill-bonobo: 22/54] Merge branch 'master' into kill-bonobo
- From: Matthew Barnes <mbarnes src gnome org>
- To: svn-commits-list gnome org
- Subject: [evolution/kill-bonobo: 22/54] Merge branch 'master' into kill-bonobo
- Date: Tue, 14 Jul 2009 18:55:00 +0000 (UTC)
commit 31fd01398cc76d3c00abbc05d419dfe873bc04c6
Merge: f9049cd... 10fef4a...
Author: Matthew Barnes <mbarnes redhat com>
Date: Fri Jul 10 14:11:48 2009 -0400
Merge branch 'master' into kill-bonobo
Conflicts:
addressbook/util/addressbook.h
calendar/gui/e-week-view-main-item.c
configure.ac
e-util/Makefile.am
mail/em-account-editor.c
mail/em-folder-selection-button.c
shell/e-shell.c
acinclude.m4 | 110 +-
.../gui/contact-editor/contact-editor.glade | 206 +-
calendar/gui/comp-util.c | 8 +-
calendar/gui/comp-util.h | 2 +-
calendar/gui/dialogs/cal-prefs-dialog.c | 33 +-
calendar/gui/dialogs/cal-prefs-dialog.glade | 137 +-
calendar/gui/dialogs/cal-prefs-dialog.h | 1 +
calendar/gui/e-cal-model.c | 6 +-
calendar/gui/e-cal-model.h | 2 +-
calendar/gui/e-calendar-view.c | 25 +-
calendar/gui/e-calendar-view.h | 2 +
calendar/gui/e-day-view-main-item.c | 35 +-
calendar/gui/e-day-view.c | 7 +-
calendar/gui/e-day-view.h | 1 +
calendar/gui/e-week-view-main-item.c | 59 +-
calendar/gui/e-week-view.c | 25 +-
calendar/gui/e-week-view.h | 2 +
calendar/gui/gnome-cal.c | 20 +-
configure.ac | 340 +-
plugins/calendar-weather/Makefile.am | 5 +-
plugins/mail-notification/Makefile.am | 2 +-
po/es.po | 438 +-
po/sv.po | 675 +-
po/uk.po |12091 ++++++++++----------
shell/e-shell-nm.c | 35 +
shell/main.c | 28 +
widgets/misc/e-calendar-item.c | 3 +-
widgets/misc/e-dateedit.c | 6 +
28 files changed, 7618 insertions(+), 6686 deletions(-)
---
diff --cc calendar/gui/e-calendar-view.c
index 03d6e69,8cab14b..82b4704
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@@ -2566,8 -2660,52 +2566,31 @@@ draw_curved_rectangle (cairo_t *cr, dou
static void
error_response(GtkWidget *widget, gint response, gpointer data)
{
- gtk_widget_destroy (widget);
-}
-
-void
-e_calendar_utils_show_error_silent (GtkWidget *widget)
-{
- EActivityHandler *handler = calendar_component_peek_activity_handler (calendar_component_peek ());
-
- if(!g_object_get_data ((GObject *) widget, "response-handled")) {
- g_signal_connect(widget, "response", G_CALLBACK(error_response), NULL);
- }
-
- e_activity_handler_make_error (handler, "calendar", E_LOG_ERROR, widget);
-}
-
-void
-e_calendar_utils_show_info_silent (GtkWidget *widget)
-{
- EActivityHandler *handler = calendar_component_peek_activity_handler (calendar_component_peek ());
-
- if(!g_object_get_data ((GObject *) widget, "response-handled")) {
- g_signal_connect(widget, "response", G_CALLBACK(error_response), NULL);
- }
-
- e_activity_handler_make_error (handler, "calendar", E_LOG_WARNINGS, widget);
+ if (response == GTK_RESPONSE_DELETE_EVENT)
+ gtk_widget_destroy(widget);
+ else if (response == GTK_RESPONSE_OK)
+ gtk_widget_destroy(widget);
}
+
+ /* returns either light or dark yellow, based on the base_background,
+ which is the default background color */
+ GdkColor
+ get_today_background (const GdkColor base_background)
+ {
+ GdkColor res = base_background;
+
+ if (res.red > 0x7FFF) {
+ /* light yellow for a light theme */
+ res.red = 0xFFFF;
+ res.green = 0xFFFF;
+ res.blue = 0xC0C0;
+ } else {
+ /* dark yellow for a dark theme */
+ res.red = 0x3F3F;
+ res.green = 0x3F3F;
+ res.blue = 0x0000;
+ }
+
+ return res;
+ }
+
diff --cc calendar/gui/e-week-view-main-item.c
index bfc95eb,47804cb..3ea3e2e
--- a/calendar/gui/e-week-view-main-item.c
+++ b/calendar/gui/e-week-view-main-item.c
@@@ -29,7 -29,8 +29,8 @@@
#include <glib.h>
#include <glib/gi18n.h>
#include "e-week-view-main-item.h"
- /*#include "a11y/ea-calendar.h"*/ /* KILL-BONOBO */
-#include "ea-calendar.h"
++/*#include "ea-calendar.h"*/ /* KILL-BONOBO */
+ #include "calendar-config.h"
static void e_week_view_main_item_set_property (GObject *object,
guint property_id,
diff --cc configure.ac
index 5df7d64,84c916f..42b8726
--- a/configure.ac
+++ b/configure.ac
@@@ -1767,12 -1754,12 +1764,12 @@@ EVO_PLUGIN_RULE=$srcdir/plugin.m
AC_SUBST_FILE(EVO_PLUGIN_RULE)
AC_ARG_ENABLE([plugins],
- AC_HELP_STRING([--enable-plugins=[no/base/all/experimental/list]],
- [Enable plugins.]),
- [enable_plugins="$enableval"],[enable_plugins=all])
+ AS_HELP_STRING([--enable-plugins=[no/base/all/experimental/list]],
+ [Enable plugins.]),
+ [enable_plugins="$enableval"],[enable_plugins=all])
dnl Add any new plugins here
-plugins_base_always="calendar-file calendar-http $CALENDAR_WEATHER itip-formatter plugin-manager default-source addressbook-file startup-wizard mark-all-read groupwise-features groupwise-account-setup mail-account-disable publish-calendar caldav imap-features google-account-setup webdav-account-setup"
+plugins_base_always="calendar-file calendar-http $CALENDAR_WEATHER itip-formatter plugin-manager default-source addressbook-file startup-wizard mark-all-read groupwise-features groupwise-account-setup publish-calendar caldav imap-features google-account-setup webdav-account-setup"
plugins_base="$plugins_base_always $SA_JUNK_PLUGIN $BF_JUNK_PLUGIN $EXCHANGE_PLUGIN $MONO_PLUGIN "
all_plugins_base="$plugins_base_always sa-junk-plugin bogo-junk-plugin exchange-operations mono"
diff --cc plugins/mail-notification/Makefile.am
index f1f121f,ac8a7c9..674c8cd
--- a/plugins/mail-notification/Makefile.am
+++ b/plugins/mail-notification/Makefile.am
@@@ -25,14 -25,12 +25,14 @@@ plugin_LTLIBRARIES = liborg-gnome-mail-
liborg_gnome_mail_notification_la_SOURCES = mail-notification.c
liborg_gnome_mail_notification_la_LDFLAGS = \
-module -avoid-version $(NO_UNDEFINED)
-liborg_gnome_mail_notification_la_LIBADD = \
- $(LIBNOTIFY_LIBS) \
- $(NO_UNDEFINED_REQUIRED_LIBS)
+liborg_gnome_mail_notification_la_LIBADD = \
+ $(LIBNOTIFY_LIBS) \
+ $(top_builddir)/e-util/libeutil.la \
+ $(top_builddir)/mail/libevolution-mail.la \
+ $(GNOME_PLATFORM_LIBS)
if ENABLE_DBUS
- liborg_gnome_mail_notification_la_LDFLAGS += $(NMN_LIBS)
+ liborg_gnome_mail_notification_la_LIBADD += $(NMN_LIBS)
endif
schemadir = $(GCONF_SCHEMA_FILE_DIR)
diff --cc shell/e-shell-nm.c
index 581e505,12f446b..c520600
--- a/shell/e-shell-nm.c
+++ b/shell/e-shell-nm.c
@@@ -96,8 -102,36 +96,41 @@@ e_shell_network_monitor (DBusConnectio
return DBUS_HANDLER_RESULT_HANDLED;
}
+ static void
+ check_initial_state (EShell *shell)
+ {
+ DBusMessage *message = NULL, *response = NULL;
+ guint32 state = -1;
+ DBusError error = DBUS_ERROR_INIT;
+
- message = dbus_message_new_method_call (NM_DBUS_SERVICE, NM_DBUS_PATH, NM_DBUS_INTERFACE, "state");
++ message = dbus_message_new_method_call (
++ NM_DBUS_SERVICE, NM_DBUS_PATH, NM_DBUS_INTERFACE, "state");
+
+ /* assuming this should be safe to call syncronously */
- response = dbus_connection_send_with_reply_and_block (dbus_connection, message, 100, &error);
++ response = dbus_connection_send_with_reply_and_block (
++ dbus_connection, message, 100, &error);
+
+ if (response)
- dbus_message_get_args (response, &error, DBUS_TYPE_UINT32, &state, DBUS_TYPE_INVALID);
++ dbus_message_get_args (
++ response, &error, DBUS_TYPE_UINT32,
++ &state, DBUS_TYPE_INVALID);
+ else {
- g_warning ("%s \n", error.message);
++ g_warning ("%s", error.message);
+ dbus_error_free (&error);
+ return;
+ }
+
- /* update the state only in the absence of network connection else let the old state prevail */
- if (state == NM_STATE_DISCONNECTED)
- e_shell_set_line_status (shell, GNOME_Evolution_FORCED_OFFLINE);
++ /* Update the state only in the absence of a network connection,
++ * otherwise let the old state prevail. */
++ if (state == NM_STATE_DISCONNECTED)
++ e_shell_set_network_available (shell, FALSE);
+
+ dbus_message_unref (message);
+ dbus_message_unref (response);
+ }
+
gboolean
-e_shell_dbus_initialise (EShell *shell)
+e_shell_dbus_initialize (EShell *shell)
{
DBusError error = DBUS_ERROR_INIT;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
