diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-05-04 21:08:32 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-05-04 21:08:32 +0800 |
| commit | c3e0648d8b5a1d73f82f0a7691b9ab1320248392 (patch) | |
| tree | 677c9472380b3119d08f42eb48c001d18bfd6243 /shell | |
| parent | 5395bd3308e25f3ca2ac1b35460ba6df1d294f4b (diff) | |
| parent | fb970ccf14e33d92cfb9409d44f7b06355e958fc (diff) | |
| download | gsoc2013-evolution-c3e0648d8b5a1d73f82f0a7691b9ab1320248392.tar gsoc2013-evolution-c3e0648d8b5a1d73f82f0a7691b9ab1320248392.tar.gz gsoc2013-evolution-c3e0648d8b5a1d73f82f0a7691b9ab1320248392.tar.bz2 gsoc2013-evolution-c3e0648d8b5a1d73f82f0a7691b9ab1320248392.tar.lz gsoc2013-evolution-c3e0648d8b5a1d73f82f0a7691b9ab1320248392.tar.xz gsoc2013-evolution-c3e0648d8b5a1d73f82f0a7691b9ab1320248392.tar.zst gsoc2013-evolution-c3e0648d8b5a1d73f82f0a7691b9ab1320248392.zip | |
Merge branch 'master' into kill-bonobo
Conflicts:
addressbook/gui/Makefile.am
addressbook/gui/widgets/Makefile.am
addressbook/gui/widgets/eab-popup-control.c
calendar/gui/e-meeting-time-sel.c
calendar/gui/migration.c
calendar/modules/e-memo-shell-module-migrate.h
e-util/e-logger.c
mail/e-mail-attachment-bar.c
mail/em-composer-utils.c
mail/em-format-html-display.c
plugins/mail-account-disable/Makefile.am
plugins/select-one-source/Makefile.am
po/es.po
shell/Makefile.am
shell/e-shell-common.h
shell/e-shell-nm.c
shell/e-shell-window-commands.c
shell/e-shell-window.c
shell/e-sidebar.c
shell/e-user-creatable-items-handler.c
shell/importer/Makefile.am
shell/test/Makefile.am
widgets/misc/test-error.c
widgets/misc/test-info-label.c
widgets/misc/test-multi-config-dialog.c
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/Makefile.am | 16 | ||||
| -rw-r--r-- | shell/e-shell-nm.c | 2 | ||||
| -rw-r--r-- | shell/evolution-icon.rc | 4 | ||||
| -rw-r--r-- | shell/evolution-mail.ico | bin | 0 -> 19622 bytes | |||
| -rw-r--r-- | shell/evolution-memos.ico | bin | 0 -> 19622 bytes | |||
| -rw-r--r-- | shell/evolution-tasks.ico | bin | 0 -> 19622 bytes | |||
| -rw-r--r-- | shell/evolution.ico | bin | 0 -> 19622 bytes |
7 files changed, 19 insertions, 3 deletions
diff --git a/shell/Makefile.am b/shell/Makefile.am index d20b49a3d0..8fd5896fe3 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -94,6 +94,10 @@ libeshell_la_LIBADD = \ # Evolution executable +if HAVE_WINDRES +EVOLUTIONICONRC = evolution-icon.o +endif + evolution_SOURCES = \ $(DATASERVER_IDL_GENERATED) \ $(NM_SUPPORT_FILES) \ @@ -117,7 +121,8 @@ evolution_LDADD = \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/e-util/libeutil.la \ $(TZDIALOG_LIBS) \ - $(SHELL_LIBS) + $(SHELL_LIBS) \ + $(EVOLUTIONICONRC) if OS_WIN32 evolution_LDFLAGS = -mwindows @@ -191,7 +196,12 @@ EXTRA_DIST = \ $(glade_DATA) \ $(schema_in_files) \ ChangeLog.pre-1-4 \ - evolution-nognome.in + evolution-nognome.in \ + evolution-icon.rc \ + evolution.ico \ + evolution-mail.ico \ + evolution-memos.ico \ + evolution-tasks.ico # Purify support @@ -217,5 +227,7 @@ dist-hook: noinst_SCRIPTS = evolution-nognome +evolution-icon.o: evolution.ico evolution-mail.ico evolution-memos.ico evolution-tasks.ico + $(WINDRES) evolution-icon.rc evolution-icon.o -include $(top_srcdir)/git.mk diff --git a/shell/e-shell-nm.c b/shell/e-shell-nm.c index c1598b4a7d..7b2f49e236 100644 --- a/shell/e-shell-nm.c +++ b/shell/e-shell-nm.c @@ -63,7 +63,7 @@ e_shell_network_monitor (DBusConnection *connection G_GNUC_UNUSED, dbus_connection_unref (dbus_connection); dbus_connection = NULL; - g_timeout_add (3000, (GSourceFunc) reinit_dbus, shell); + g_timeout_add_seconds (3, reinit_dbus, shell); return DBUS_HANDLER_RESULT_HANDLED; } diff --git a/shell/evolution-icon.rc b/shell/evolution-icon.rc new file mode 100644 index 0000000000..275dac7d4a --- /dev/null +++ b/shell/evolution-icon.rc @@ -0,0 +1,4 @@ +1 ICON "evolution.ico" +2 ICON "evolution-mail.ico" +3 ICON "evolution-memos.ico" +4 ICON "evolution-tasks.ico" diff --git a/shell/evolution-mail.ico b/shell/evolution-mail.ico Binary files differnew file mode 100644 index 0000000000..8922dd1957 --- /dev/null +++ b/shell/evolution-mail.ico diff --git a/shell/evolution-memos.ico b/shell/evolution-memos.ico Binary files differnew file mode 100644 index 0000000000..7fa6f4c00e --- /dev/null +++ b/shell/evolution-memos.ico diff --git a/shell/evolution-tasks.ico b/shell/evolution-tasks.ico Binary files differnew file mode 100644 index 0000000000..73c607982c --- /dev/null +++ b/shell/evolution-tasks.ico diff --git a/shell/evolution.ico b/shell/evolution.ico Binary files differnew file mode 100644 index 0000000000..8e34f745a6 --- /dev/null +++ b/shell/evolution.ico |