From c7d8ad5a1a2b3b89e6a1cae85b73eb5baa3f2ad9 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 29 Apr 2009 14:32:32 -0400 Subject: Use the standard FAQ icon for Help -> Evolution FAQ --- shell/e-shell-window-commands.c | 1 + 1 file changed, 1 insertion(+) (limited to 'shell') diff --git a/shell/e-shell-window-commands.c b/shell/e-shell-window-commands.c index 609e7c79b3..224dd67171 100644 --- a/shell/e-shell-window-commands.c +++ b/shell/e-shell-window-commands.c @@ -1137,6 +1137,7 @@ static EPixmap pixmaps [] = { E_PIXMAP ("/menu/File/FileClose", "window-close", E_ICON_SIZE_MENU), E_PIXMAP ("/menu/File/FileExit", "application-exit", E_ICON_SIZE_MENU), E_PIXMAP ("/menu/Edit/Settings", "preferences-desktop", E_ICON_SIZE_MENU), + E_PIXMAP ("/menu/Help/HelpOpenFAQ", "help-faq", E_ICON_SIZE_MENU), E_PIXMAP_END }; -- cgit v1.2.3 From c1a12789acbbc59830e9141da9024debaecccdb2 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 30 Apr 2009 22:54:15 -0400 Subject: =?UTF-8?q?Bug=20580893=20=E2=80=93=20Kill=20libgnome/gnome-gconf?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shell/e-shell-window.c | 1 - shell/e-sidebar.c | 1 - shell/e-user-creatable-items-handler.c | 1 - 3 files changed, 3 deletions(-) (limited to 'shell') diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c index 204b9286b0..516df0cfdb 100644 --- a/shell/e-shell-window.c +++ b/shell/e-shell-window.c @@ -46,7 +46,6 @@ #include #include -#include #include diff --git a/shell/e-sidebar.c b/shell/e-sidebar.c index 37ff2fed13..7b8ba1a53a 100644 --- a/shell/e-sidebar.c +++ b/shell/e-sidebar.c @@ -29,7 +29,6 @@ #include "e-util/e-util.h" #include -#include typedef struct { GtkWidget *button_widget; diff --git a/shell/e-user-creatable-items-handler.c b/shell/e-user-creatable-items-handler.c index 4ba247342c..30b0d1dfa2 100644 --- a/shell/e-user-creatable-items-handler.c +++ b/shell/e-user-creatable-items-handler.c @@ -43,7 +43,6 @@ #include #include -#include struct _Component { char *id, *alias; -- cgit v1.2.3 From d523f10dfe2a6ba53c068189f10055d46e71e10f Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 2 May 2009 11:09:30 -0400 Subject: Use Behdad's brilliant git.mk to generate .gitignore files. --- shell/Makefile.am | 2 ++ shell/importer/Makefile.am | 2 ++ shell/test/Makefile.am | 2 ++ 3 files changed, 6 insertions(+) (limited to 'shell') diff --git a/shell/Makefile.am b/shell/Makefile.am index 177d9e80be..8a7df1b1ca 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -255,3 +255,5 @@ dist-hook: noinst_SCRIPTS = evolution-nognome + +-include $(top_srcdir)/git.mk diff --git a/shell/importer/Makefile.am b/shell/importer/Makefile.am index 094df408d1..1aa5d5b484 100644 --- a/shell/importer/Makefile.am +++ b/shell/importer/Makefile.am @@ -64,3 +64,5 @@ CLEANFILES = $(BUILT_SOURCES) dist-hook: cd $(distdir); rm -f $(BUILT_SOURCES) + +-include $(top_srcdir)/git.mk diff --git a/shell/test/Makefile.am b/shell/test/Makefile.am index 266685064c..74bd509958 100644 --- a/shell/test/Makefile.am +++ b/shell/test/Makefile.am @@ -33,3 +33,5 @@ EXTRA_DIST = \ dist-hook: cd $(distdir); rm -f $(BUILD_SOURCES) + +-include $(top_srcdir)/git.mk -- cgit v1.2.3 From 6e72a236dcb592a942881e118d6a71888ea1581b Mon Sep 17 00:00:00 2001 From: Marcel Stimberg Date: Mon, 4 May 2009 10:10:55 +0530 Subject: ** BUGFIX: 573830 - g_timeout_add_seconds should be preferred to g_timeout_add According to https://wiki.ubuntu.com/SavingTheWorld (and of course according to the gtk docs) using g_timeout_add_seconds is preferred over g_timeout_add if a timeout in seconds is desired. --- shell/e-shell-nm.c | 2 +- shell/e-shell-window.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'shell') diff --git a/shell/e-shell-nm.c b/shell/e-shell-nm.c index 5162aa5fea..f7e4d3e63b 100644 --- a/shell/e-shell-nm.c +++ b/shell/e-shell-nm.c @@ -71,7 +71,7 @@ e_shell_network_monitor (DBusConnection *connection G_GNUC_UNUSED, dbus_connection_unref (dbus_connection); dbus_connection = NULL; - g_timeout_add (3000, reinit_dbus, shell); + g_timeout_add_seconds (3, reinit_dbus, shell); return DBUS_HANDLER_RESULT_HANDLED; } diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c index 516df0cfdb..9d6905203b 100644 --- a/shell/e-shell-window.c +++ b/shell/e-shell-window.c @@ -924,7 +924,7 @@ impl_size_alloc (GtkWidget* widget, GtkAllocation* alloc) if (GTK_WIDGET_REALIZED(widget) && !(gdk_window_get_state(widget->window) & GDK_WINDOW_STATE_MAXIMIZED)) { /* update the size storage timer */ - self->priv->store_window_size_timer = g_timeout_add (1000, (GSourceFunc)store_window_size, self); + self->priv->store_window_size_timer = g_timeout_add_seconds (1, (GSourceFunc)store_window_size, self); } if (GTK_WIDGET_CLASS (e_shell_window_parent_class)->size_allocate) { -- cgit v1.2.3 From fb970ccf14e33d92cfb9409d44f7b06355e958fc Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 4 May 2009 12:12:03 +0530 Subject: Add iconrc support for Evolution. The windows binary would now have the Evolution icon. --- shell/Makefile.am | 16 ++++++++++++++-- shell/evolution-icon.rc | 4 ++++ shell/evolution-mail.ico | Bin 0 -> 19622 bytes shell/evolution-memos.ico | Bin 0 -> 19622 bytes shell/evolution-tasks.ico | Bin 0 -> 19622 bytes shell/evolution.ico | Bin 0 -> 19622 bytes 6 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 shell/evolution-icon.rc create mode 100644 shell/evolution-mail.ico create mode 100644 shell/evolution-memos.ico create mode 100644 shell/evolution-tasks.ico create mode 100644 shell/evolution.ico (limited to 'shell') diff --git a/shell/Makefile.am b/shell/Makefile.am index 8a7df1b1ca..6d47f6e933 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -113,6 +113,10 @@ libeshell_la_LIBADD = \ # Evolution executable +if HAVE_WINDRES +EVOLUTIONICONRC = evolution-icon.o +endif + evolution_SOURCES = \ $(DATASERVER_IDL_GENERATED) \ $(NM_SUPPORT_FILES) \ @@ -147,7 +151,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 @@ -229,7 +234,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 @@ -255,5 +265,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/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 new file mode 100644 index 0000000000..8922dd1957 Binary files /dev/null and b/shell/evolution-mail.ico differ diff --git a/shell/evolution-memos.ico b/shell/evolution-memos.ico new file mode 100644 index 0000000000..7fa6f4c00e Binary files /dev/null and b/shell/evolution-memos.ico differ diff --git a/shell/evolution-tasks.ico b/shell/evolution-tasks.ico new file mode 100644 index 0000000000..73c607982c Binary files /dev/null and b/shell/evolution-tasks.ico differ diff --git a/shell/evolution.ico b/shell/evolution.ico new file mode 100644 index 0000000000..8e34f745a6 Binary files /dev/null and b/shell/evolution.ico differ -- cgit v1.2.3