Merge lp:~goehle/evolution-indicator/dont-quit-on-close into lp:evolution-indicator

[Geoff Goehle]

A fix of the last merge, which was bungled.

I've included functionality which allows the indicator-applet to have evolution run in the background with no open windows.

Using g_signal when the last open shell window is closed the indicator applet hides the window instead of deleting it. This gives the impression that evolution is "running in the applet".

I also implemented the ability to turn this feature on and off and to run evolution on startup.

[Geoff Goehle (goehle)]

Still getting used to merging and bzr. Some of these changes are not intended.... The bulk should be there but lines 70-120, 190-162, 380-414, 488-565 should removed.

[lp:~goehle/evolution-indicator/dont-quit-on-close]

74. By Geoff Goehle on 2010-11-29

Fixed unintended changes and added a missing file

[Didier Roche-Tolomelli (didrocks)]

Thanks a lot for your work there, you should have a look at the ayatana discussions that took place during latest UDS, particularly this spec and the video associated. You can find the reference there:
https://lists.launchpad.net/ayatana/msg04650.html

So, even if I was convinced that the "don't quit on close" and seeing email as a service was the right stuff to do, I'm not anymore and let you raise the point on the ayatana mailing list (maybe a follow up on that email?) and asking Matthew to restate those points.

[Geoff Goehle (goehle)]

I can't say that I really understand the discussion, but then again I'm
a mathematician and not a coder. The distinction between "service" vs
"nonservice" appliations is lost on me...

In any case, the whole thing is kind of moot since ubuntu is moving to
unity.

On Mon, 2011-02-07 at 15:54 +0000, Didier Roche wrote:
> Thanks a lot for your work there, you should have a look at the ayatana discussions that took place during latest UDS, particularly this spec and the video associated. You can find the reference there:
> https://lists.launchpad.net/ayatana/msg04650.html
>
> So, even if I was convinced that the "don't quit on close" and seeing email as a service was the right stuff to do, I'm not anymore and let you raise the point on the ayatana mailing list (maybe a follow up on that email?) and asking Matthew to restate those points.

[Didier Roche-Tolomelli (didrocks)]

> In any case, the whole thing is kind of moot since ubuntu is moving to
unity.

Why do you say that? the indicator are completely part of the unity experience, so this work is primordial.

[Geoff Goehle (goehle)]

I haven't used unity regularly, but from what I remember unity has the "mac" style program launchers. If there is an evolution icon on the launcher bar and evolution is minimized then there isn't a visible "window". All that changes is the icon on the launcher bar picks up a little triangle underneath, as opposed to gnome where the window stays on the task bar. So it unity you can effectively replicate the minimize to applet functionality by using the minimize button.

Still it doesn't address the fact that clicking "close" closes evolution, and it doesn't close any other Indicator Applet applications, which is a point of confusion.

[lp:~goehle/evolution-indicator/dont-quit-on-close]

75. By Geoff Goehle on 2011-05-09

Updated previous patch to work with new version of evolution indicator.
When the option is enabled the indicator will allow evolution to run
without a visible window.

76. By Geoff Goehle on 2011-05-09

Fixed unintended changes

[Geoff Goehle (goehle)]

Well I've been using unity since release and changed my mind about the need for "dont-quit-on-close" functionality being obsolete.

1. Space on the sidebar is at a premium. The icons are large enough that having the evolution icon there all the time adds clutter.

2. There are now 5 programs that make use of the indicator area (evolution, banshee, empathy, gwibber, and ubuntu-one). Of these evolution is the only one that doesn't run without an open window.

I updated my patch for the new version.

Unmerged revisions

76. By Geoff Goehle on 2011-05-09

Fixed unintended changes

75. By Geoff Goehle on 2011-05-09

Updated previous patch to work with new version of evolution indicator.
When the option is enabled the indicator will allow evolution to run
without a visible window.

74. By Geoff Goehle on 2010-11-29

Fixed unintended changes and added a missing file

=== modified file 'ChangeLog'
--- ChangeLog	2009-02-03 13:43:52 +0000
+++ ChangeLog	2011-05-09 14:58:08 +0000
@@ -1,1 +1,629 @@
+# Generated by Makefile. Do not edit.
+
[phone]  Ted Gould  <[e-mail]>
+
+	0.2.14
+
[phone]  Ted Gould  <[e-mail]>
+
+	Updating to new libindicate
+
[phone]  Ken VanDine  <[e-mail]>
+
+	Change pkgconfig check for indicate to indicate-0.5 and require 0.4.91
+
[phone]  Didier Roche  <[e-mail]>
+
+	build with new evolution
+
[phone]  Didier Roche  <[e-mail]>
+
+	new upstream release
+
[phone]  Didier Roche  <[e-mail]>
+
+	remove workaround as e-d-s get it right now
+
[phone]  Didier Roche  <[e-mail]>
+
+	workaround for local Inbox as not tagged as an Inbox for evolution
+
[phone]  Didier Roche  <[e-mail]>
+
+	better debug messages
+
[phone]  Didier Roche  <[e-mail]>
+
+	prefer a debug to print
+
[phone]  Didier Roche  <[e-mail]>
+
+	correct gdk_display transtype
+
[phone]  Didier Roche  <[e-mail]>
+
+	add some flags for deprecation
+
[phone]  Didier Roche  <[e-mail]>
+
+	build with gtk deprecation flags (LP: #655937)
+
[phone]  Didier Roche  <[e-mail]>
+
+	bump version for release
+
[phone]  Didier Roche  <[e-mail]>
+
+	merge evo 2.30 branch
+
[phone]  Francesco Marella  <[e-mail]>
+
+	merge master branch
+
[phone]  Francesco Marella  <[e-mail]>
+
+	Merge with master branch
+
[phone]  Francesco Marella  <[e-mail]>
+
+	Remove hook for event "started.done"
+
[phone]  Francesco Marella  <[e-mail]>
+
+	Fix evolution-indicator to work with Evolution 2.30
+	
+	Changes:
+	- rip off e-shell.h, tomboy copy-paste code
+	- properly get the shell and the shell window (mail-notification plugin inspired me :))
+	- present the shell window with event time provided by libindicate
+
[phone]  Ted Gould  <[e-mail]>
+
+	0.2.8
+
[phone]  Ted Gould  <[e-mail]>
+
+	Use property syntax for ngettext
+
[phone]  Ted Gould  <[e-mail]>
+
+	Bug number
+
[phone]  Ted Gould  <[e-mail]>
+
+	Remove extra _() markers that are messing up translation.
+
[phone]  Ted Gould  <[e-mail]>
+
+	0.2.7
+
[phone]  Ted Gould  <[e-mail]>
+
+	Command items for running evolution.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding some command menu items.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Need newest libindicate
+
[phone]  Ted Gould  <[e-mail]>
+
+	Updating to signals from new libindicate and using the timestamps.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Bumping up indicate required version to 0.3.0 to get the new signals.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Excising the tomboy present code.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Getting the timestamp out of the display signal and switching to present_with_time
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	[release] 0.2.6
+
[phone]  Ken VanDine  <[e-mail]>
+
+	The Evolution Desktop file has moved.
+
[phone]  Ken VanDine  <[e-mail]>
+
+	Fixed path to evolution desktop file
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	Fix 436755 (indicator-applet doesn't change icon when I recieve new e-mails via Evolution)
+	
+	Basically add support for a default Inbox for POP3
+	
+	modified:
+	po/Makefile.in.in
+	src/evolution-indicator.c
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	modified:
+	src/evolution-indicator.c
+	- A line went missing :(
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	modified:
+	src/evolution-indicator.c
+	- Some stability fixes
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	modified:
+	po/Makefile.in.in
+	src/evolution-indicator.c
+	- Add support POP accounts (default Inbox)
+	- Make sure we can translate it without requiring new strings
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	modified:
+	configure.ac
+	- New release 0.2.4
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	modified:
+	src/evolution-indicator.c
+	pending merges:
+	Neil Jagdish Patel 2009-09-16 modified:
+	Neil Jagdish Patel 2009-09-16 modified:
+	Neil Jagdish Patel 2009-09-16 modified:
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	modified:
+	src/evolution-indicator.c 
+	- Create directory before writing to it as per teds comments
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	modified:
+	src/evolution-indicator.c
+	- Be more strict in hiding the server is show_messages is disabled
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	modified:
+	src/evolution-indicator.c
+	- Add support to writing/deleting the blacklist file
+	- Show/hide the evolution entry in the menu depending on the user checking
+	/unchecking the "show in panel" box and/or enabling/disabling the
+	plugin
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	modified:
+	src/evolution-indicator.c
+	pending merges:
+	Neil Jagdish Patel 2009-09-16 modified:
+	Neil Jagdish Patel 2009-09-16 modified:
+	Neil Jagdish Patel 2009-09-16 modified:
+	Neil Jagdish Patel 2009-09-16 modified:
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	modified:
+	src/evolution-indicator.c
+	- Don't show accounts that can't receive mail, and therefore will never have
+	an unread message count
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	modified:
+	src/evolution-indicator.c
+	- Instead of destroying the indicator of an inactive account, hide it
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	modified:
+	src/evolution-indicator.c
+	- Woops, forgot to increment i in while loop
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	modified:
+	src/evolution-indicator.c
+	- Ignore accounts where enabled==false in gconf
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	modified:
+	src/evolution-indicator.c
+	pending merges:
+	Neil Jagdish Patel 2009-09-16 modified:
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	modified:
+	src/evolution-indicator.c
+	- Zero the global message count when we zero the indicator counts
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	modified:
+	configure.ac
+	- New release
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	modified:
+	src/evolution-indicator.c
+	- Woops, typo
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	modified:
+	src/evolution-indicator.c
+	- Update the names to be lowercase
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	modified:
+	configure.ac
+	- Bump required version of libindicate to 0.2.0
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	modified:
+	configure.ac
+	- Release 0.2.0 for libindicate-0.2 
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	removed:
+	src/mail-server.c
+	src/mail-server.h
+	modified:
+	.bzrignore
+	Makefile.am
+	configure.ac
+	src/Makefile.am
+	src/evolution-indicator.c
+	pending merges:
+	Neil Jagdish Patel 2009-09-09 modified:
+	Neil Jagdish Patel 2009-09-09 modified:
+	Neil Jagdish Patel 2009-09-09 modified:
+	Neil Jagdish Patel 2009-09-09 modified:
+	Neil Jagdish Patel 2009-09-09 modified:
+	Neil Jagdish Patel 2009-09-09 modified:
+	Neil Jagdish Patel 2009-09-09 modified:
+	Neil Jagdish Patel 2009-09-09 modified:
+	Neil Jagdish Patel 2009-09-09 modified:
+	Neil Jagdish Patel 2009-09-09 Update ignores
+	Neil Jagdish Patel 2009-09-09 removed:
+	
+	- Merged branch that added support for the new libindicate (0.2) and
+	added support for multiple-mailboxes
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	modified:
+	Makefile.am
+	- Add support for generating ChangeLog on make dist
+	
+	src/evolution-indicator.c
+	Make Ted's suggested changes (thanks!)
+	- Move "unread" string into #define
+	- Use g_strdup_printf instead of pre-alloc'ed buf & g_sprintf
+	- Initialise GTimeVal struct to NULL properly
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	modified:
+	src/evolution-indicator.c
+	- Fix warning
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	modified:
+	src/evolution-indicator.c
+	- Add some support for showing the evolution window
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	modified:
+	src/evolution-indicator.c
+	- Clean up read-notify a bit
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	modified:
+	src/evolution-indicator.c
+	- Reset count and don't look for attention when the mail is 'read' as
+	defined by evolution :)
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	modified:
+	src/evolution-indicator.c
+	- Stray '-' screwed up processing of new mail
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	modified:
+	src/evolution-indicator.c
+	- Added a debug statement
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	modified:
+	src/evolution-indicator.c 
+	- Add some support for indicating new messages
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	modified:
+	src/evolution-indicator.c
+	- Try updating with multiples of minutes
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	Update ignores
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	removed:
+	src/mail-server.c
+	src/mail-server.h
+	- Not needed anymore
+	
+	modified:
+	configure.ac
+	- Bump version
+	
+	src/Makefile.am
+	- Remove mail-server.*
+	
+	src/evolution-indicator.c
+	- Use libindicate directly, creating indicator per account
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	modified:
+	po/Makefile.in.in
+	src/evolution-indicator.c
+	pending merges:
+	Neil Jagdish Patel 2009-09-08 modified:
+	Neil Jagdish Patel 2009-09-08 modified:
+	Neil Jagdish Patel 2009-09-08 modified:
+	Neil Jagdish Patel 2009-08-25 modified:
+	
+	- Move the preferences group to the top of the tab
+	- Add support for changing the strings used depending on the number of
+	configured accounts
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	modified:
+	src/evolution-indicator.c
+	- Capitalise 'any' in 'Any Inbox', so it matches with the rest of the
+	sentence, and the 'Any Folder' option.
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	modified:
+	src/evolution-indicator.c
+	- Depending on the number of accounts, change the text shown in
+	the combo (Inbox vs. any Inbox)
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	modified:
+	po/Makefile.in.in
+	src/evolution-indicator.c
+	- Add some support to get the number of accounts
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	modified:
+	src/evolution-indicator.c
+	- Move the preferences to the top of the pane
+
[phone]  Ted Gould  <[e-mail]>
+
+	Releasing version 0.1.16
+
[phone]  Ted Gould  <[e-mail]>
+
+	Cleaning up some more
+
[phone]  Ted Gould  <[e-mail]>
+
+	Ken Vandine's patch to include gtk-html-editor as it's needed for the new Evolution
+
[phone]  Ken VanDine  <[e-mail]>
+
+	Added gtkhtml-editor to PKG_CHECK_MODULES, some evolution headers have changed so now we need to find the include path for it.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Making a 15 -- brown paper bag release.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Changing the truthiness of the string comparison
+
[phone]  Ted Gould  <[e-mail]>
+
+	Making 14
+
[phone]  Ted Gould  <[e-mail]>
+
+	Use 'g_strcmp0' instead of 'g_str_equal' to protect against the NULL string from '_wnck_get_wmclass'
+
[phone]  Ted Gould  <[e-mail]>
+
+	Now we're 13.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding the LP bug.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Switch to using the library version of the GLib Internationalization code.
+
[phone]  Ted Gould  <[e-mail]>
+
+	These seem to change the domain for all of Evolution, which really isn't a good idea.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Wow, growing up to 12 already.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Patch to fix i18n issues in sending notifications.  Patch from Timo Jyrinki.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Ah, forgot to add files
+
[phone]  Ted Gould  <[e-mail]>
+
+	Patch from the great Neil Patel to make it so that we use X.org to determine if the current window is Evolution.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Hmm, not sure why this change, but seems benign
+
[phone]  Ted Gould  <[e-mail]>
+
+	Bumping version number
+
[phone]  Ted Gould  <[e-mail]>
+
+	Patch from Neil which makes it so that Evo doesn't send notificaitons when focused
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding a configure option to override the install directory so that we can pass distcheck
+
[phone]  Ted Gould  <[e-mail]>
+
+	Incrementing version number
+
[phone]  Ted Gould  <[e-mail]>
+
+	Make it so that the IDs are always unique, even if they're not used heavily.  This fixes some warnings on the listeners.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Changing the icon name.  Match from Mirco Muller.
+
[phone]  Ted Gould  <[e-mail]>
+
+	0.1.9
+
[phone]  Ted Gould  <[e-mail]>
+
+	Some slight changes for distcheck to be happy.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Leaving the packaging for the packaging branch
+
[phone]  Ted Gould  <[e-mail]>
+
+	releasing version 0.1.8+ppa1
+
[phone]  Ted Gould  <[e-mail]>
+
+	releasing version 0.1.8
+
[phone]  Ted Gould  <[e-mail]>
+
+	Setting the destkop file and the type for the indicator
+	server subclass.
+
[phone]  Ted Gould  <[e-mail]>
+
+	releasing version 0.1.7+ppa2
+
[phone]  Ted Gould  <[e-mail]>
+
+	releasing version 0.1.7+ppa1
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	-Redo the way message count is stored and signalled to the server
+	-Send indicator-added indicator-removed for every individual  email
+	-Allow the user to disable the indicator aspect of the notifications
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	releasing version 0.1.7
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	* Added support for 
+	- Only Inbox/All Folders notification
+	- Showing notification bubbles, updating them
+	- Playing sounds through the bubble
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	Update ignores
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	* Hook up the preferences to gconf, install schemas and keep up-to-date
+	* Added support for showing the preferences in the general tab of mail
+	preferences
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	Add support for GConf and i18n support
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	Initial support for preferences (layout)
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	evolution-indicator (0.1.3) intrepid; urgency=low
+	
+	* Reset indicator count when the user requests the showing of the window.
+	
+	-- Neil J. Patel <[e-mail]>  Wed, 04 Feb 2009 11:53:04 +0100
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	add the e-shell.h header
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	evolution-indicator (0.1.2) intrepid; urgency=low
+	
+	* Add support for ShowIndicatorToUser, by presenting the current Evolution
+	"Mail" window. If it does not exist, present the first window available.
+	
+	-- Neil J. Patel <[e-mail]>  Wed, 04 Feb 2009 11:39:27 +0100
+	
+	evolution-indicator (0.1.1) intrepid; urgency=low
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	Update packaging
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	* Seconf to initial commit
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	Initial Commit
 

=== removed file 'autogen.sh'
--- autogen.sh	2009-02-03 14:47:26 +0000
+++ autogen.sh	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-PKG_NAME="evolution-indicator"
-
-which gnome-autogen.sh || {
-	echo "You need gnome-common from GNOME SVN"
-	exit 1
-}
-
-USE_GNOME2_MACROS=1 \
-. gnome-autogen.sh

=== modified file 'configure.ac'
--- configure.ac	2011-02-25 18:17:25 +0000
+++ configure.ac	2011-05-09 14:58:08 +0000
@@ -66,7 +66,12 @@
                   libnotify
                   libcanberra
                   gtkhtml-editor-3.14
-                  unity
+<<<<<<< TREE
+                  unity
+=======
+                  unity
+		  dee-1.0
+>>>>>>> MERGE-SOURCE
                   )
 AC_SUBST(DEPS_CFLAGS)
 AC_SUBST(DEPS_LIBS)

=== modified file 'data/evolution-indicator.schemas.in'
--- data/evolution-indicator.schemas.in	2009-02-09 15:27:51 +0000
+++ data/evolution-indicator.schemas.in	2011-05-09 14:58:08 +0000
@@ -45,5 +45,38 @@
       </locale>
     </schema>
 
+    <schema>
+      <key>/schemas/apps/evolution/eplugin/evolution_indicator/minimize_to_applet</key>
+      <applyto>/apps/evolution/eplugin/evolution_indicator/minimize_to_applet</applyto>
+      <owner>evolution-indicator</owner>
+      <type>bool</type>
+      <default>true</default>
+      <locale name="C">
+        <short>Use the indicator applet to keep evolution running without any visible windows.</short>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/apps/evolution/eplugin/evolution_indicator/run_on_startup</key> 
+      <applyto>/apps/evolution/eplugin/evolution_indicator/run_on_startup</applyto>
+      <owner>evolution-indicator</owner>
+      <type>bool</type>
+      <default>false</default>
+      <locale name="C">
+      <short>Run evolution when computer starts.</short>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/apps/evolution/eplugin/evolution_indicator/hide_on_startup</key>
+      <applyto>/apps/evolution/eplugin/evolution_indicator/hide_on_startup</applyto>
+      <owner>evolution-indicator</owner>
+      <type>bool</type>
+      <default>false</default>
+      <locale name="C">
+        <short>Hide evolution once it starts.</short>
+      </locale>
+    </schema>
+
   </schemalist>
 </gconfschemafile>

=== modified file 'src/evolution-indicator.c'
--- src/evolution-indicator.c	2011-02-25 18:17:25 +0000
+++ src/evolution-indicator.c	2011-05-09 14:58:08 +0000
@@ -55,6 +55,9 @@
 #define PLAY_SOUND        CONF_DIR"/play_sound"
 #define SHOW_BUBBLE       CONF_DIR"/show_bubble"
 #define SHOW_NEW_IN_PANEL CONF_DIR"/show_new_messages_in_panel"
+#define MINIMIZE_TO_APPLET CONF_DIR"/minimize_to_applet"
+#define RUN_ON_STARTUP     CONF_DIR"/run_on_startup"
+#define HIDE_ON_STARTUP    CONF_DIR"/hide_on_startup"
 
 #define ACCOUNT_DIR "/apps/evolution/mail"
 #define ACCOUNTS    ACCOUNT_DIR"/accounts"
@@ -84,11 +87,17 @@
 static gboolean      play_sound  = TRUE;
 static gboolean      show_bubble = TRUE;
 static gboolean      show_count  = FALSE;
+static gboolean      minimize_to_applet = TRUE;
+static gboolean      run_on_startup = FALSE;
+static gboolean      hide_on_startup = FALSE;
 
 static guint         only_inbox_id  = 0;
 static guint         play_sound_id  = 0;
 static guint         show_bubble_id = 0;
 static guint         show_count_id  = 0;
+static guint         minimize_to_applet_id = 0;
+static guint         run_on_startup_id = 0;
+static guint         hide_on_startup_id = 0;
 static guint         accounts_id    = 0;
 
 static gint message_count = 0;
@@ -98,8 +107,11 @@
 
 int         e_plugin_lib_enable               (EPlugin *ep, int enable);
 GtkWidget * e_plugin_lib_get_configure_widget (EPlugin *ep);
+static GtkWidget * get_cfg_widget (void);
 
 static void show_evolution (gpointer arg0, guint timestamp, gpointer arg1);
+static gboolean window_created_event (EShell *shell, GtkWindow *window);
+static gboolean window_delete_event (EShell *shell, GtkWindow *window);
 
 static void show_evolution_in_indicator_applet (void);
 static void hide_evolution_in_indicator_applet (void);
@@ -122,18 +134,6 @@
   REAP_NAME
 };
 
-static GtkWidget *
-get_cfg_widget (void)
-{
-	GtkWidget *vbox;
-
-	vbox = gtk_vbox_new (FALSE, 6);
-
-	gtk_widget_show (vbox);
-
-	return vbox;
-}
-
 static gboolean
 evolution_is_focused (void)
 {
@@ -429,6 +429,83 @@
 }
 
 static void
+minimize_to_applet_changed (GConfClient *gclient, 
+                    guint        id,
+                    GConfEntry  *entry,
+                    gpointer     data)
+{
+  GConfValue *value;
+  
+  value = entry->value;
+  
+  minimize_to_applet = gconf_value_get_bool (value);
+
+  g_debug ("EI: Minimize to applet %s", minimize_to_applet ? "true" : "false");
+}
+
+static void
+hide_on_startup_changed (GConfClient *gclient, 
+                    guint        id,
+                    GConfEntry  *entry,
+                    gpointer     data)
+{
+  GConfValue *value;
+  
+  value = entry->value;
+  
+  hide_on_startup = gconf_value_get_bool (value);
+
+  g_debug ("EI: Hide on Startup %s", hide_on_startup ? "true" : "false");
+}
+
+static void
+run_on_startup_changed (GConfClient *gclient, 
+                    guint        id,
+                    GConfEntry  *entry,
+                    gpointer     data)
+{
+  GConfValue *value;
+  char *home ;
+  char *command ;
+  char *desktopfile;
+  gboolean result;
+  
+  value = entry->value;
+  
+  run_on_startup = gconf_value_get_bool (value);
+
+  home = getenv ("HOME");
+  desktopfile = g_strdup(EVOLUTION_DESKTOP_FILE);
+
+  if (run_on_startup) {
+    command = g_strdup_printf("test -d %s/.config/autostart", home);
+    result = system(command);
+    g_free(command);
+    if (result) {
+      command = g_strdup_printf("mkdir -p %s/.config/autostart",home);
+      result = system(command);
+      g_free(command);
+
+    }
+    
+    command = g_strdup_printf("cp %s %s/.config/autostart/",desktopfile,home); 
+    result = system(command);
+    g_free(command);
+
+    if (result)
+      g_debug("EI: could not create file in autostart!");
+  } else {
+    command = g_strdup_printf("rm %s/.config/autostart/evolution.desktop",home);
+    result = system(command);
+    g_free(command);
+  }
+  
+  g_free(desktopfile);
+  g_debug ("EI: run_on_startup %s", run_on_startup ? "true" : "false");
+
+}
+
+static void
 show_new_in_panel_changed (GConfClient *gclient, 
                            guint        id,
                            GConfEntry  *entry,
@@ -641,6 +718,7 @@
             }
           else
             {
+<<<<<<< TREE
               if (data.url && g_str_has_prefix (data.url, "pop:"))
                 {
                   indicator = create_indicator ("pop:",
@@ -651,6 +729,18 @@
                 {
                   indicator = create_indicator (data.url, data.name);
                 }
+=======
+              if (data.url && g_str_has_prefix (data.url, "pop:"))
+                {
+                  indicator = create_indicator ("pop:",
+                                                g_dgettext (EVO_I18N_DOMAIN,
+						"Inbox"));
+                }
+              else
+                {
+                  indicator = create_indicator (data.url, data.name);
+                }
+>>>>>>> MERGE-SOURCE
               indicators = g_slist_append (indicators, indicator);
 
               g_debug ("EI: New account: %s (%s)", data.name, data.url);
@@ -792,12 +882,70 @@
     show_count_id = gconf_client_notify_add (client, SHOW_NEW_IN_PANEL, 
                              show_new_in_panel_changed, NULL, NULL, NULL);
 
+    minimize_to_applet = gconf_client_get_bool (client,
+						MINIMIZE_TO_APPLET,
+						NULL);
+    minimize_to_applet_id = gconf_client_notify_add (client, MINIMIZE_TO_APPLET,
+			minimize_to_applet_changed, NULL, NULL, NULL);
+
+    run_on_startup = gconf_client_get_bool (client,
+					    RUN_ON_STARTUP,
+					    NULL);
+    run_on_startup_id = gconf_client_notify_add (client, RUN_ON_STARTUP,
+			  run_on_startup_changed, NULL, NULL, NULL);
+
+    hide_on_startup = gconf_client_get_bool (client,
+					    HIDE_ON_STARTUP,
+					    NULL);
+    hide_on_startup_id = gconf_client_notify_add (client, HIDE_ON_STARTUP,
+			  hide_on_startup_changed, NULL, NULL, NULL);
+
     gconf_client_add_dir (client, ACCOUNT_DIR,GCONF_CLIENT_PRELOAD_NONE, NULL);
     update_accounts ();
     accounts_id = gconf_client_notify_add (client, ACCOUNTS,
                                            on_accounts_changed, NULL,
                                            NULL, NULL);
 
+    EShell *shell = e_shell_get_default ();
+    
+    /* If we are minimizing to the applet, listen for created windows */
+    if (shell && minimize_to_applet)
+      {
+	g_signal_connect (
+			  shell, "window-created",
+			  G_CALLBACK (window_created_event), NULL);
+
+	/* Since a window was probably already created before we started 
+           we should find that window and connect up our custom delete event */
+
+	GList *list = e_shell_get_watched_windows(shell);
+	EShellWindow *window;
+
+        while (list != NULL) {
+	  window = list->data;
+	  if (E_IS_SHELL_WINDOW(window)) {
+	    
+	    /* block evolutions built in handlers from acting */
+	    g_signal_handlers_block_matched(window, G_SIGNAL_MATCH_DATA, 
+					    0, 0, NULL, NULL, shell);
+	    
+	    /* add our handler for the window deleted signal */
+	    g_signal_connect_swapped (
+				      window, "delete-event",
+				      G_CALLBACK (window_delete_event), shell);
+	    
+	    /* If we are asking evolution to hide its shell windows on 
+               then do that*/
+	    if (hide_on_startup) {
+	      gtk_window_iconify (GTK_WINDOW(window));
+	      gtk_widget_hide (GTK_WIDGET(window));
+	    }
+	  
+	  }
+	  list = g_list_next(list);
+	}
+      }    
+
     if (show_count)
     {
       indicate_server_show (server);
@@ -815,6 +963,9 @@
     gconf_client_notify_remove (client, play_sound_id);
     gconf_client_notify_remove (client, show_bubble_id);
     gconf_client_notify_remove (client, show_count_id);
+    gconf_client_notify_remove (client, minimize_to_applet_id);
+    gconf_client_notify_remove (client, run_on_startup_id);
+    gconf_client_notify_remove (client, hide_on_startup_id);
     gconf_client_notify_remove (client, accounts_id);
 
     g_object_unref (client);
@@ -839,6 +990,54 @@
 	return 0;
 }
 
+gboolean 
+window_created_event (EShell *shell, GtkWindow *window) 
+{
+
+  if (E_IS_SHELL_WINDOW(window)) {
+  
+    /* block evolutions built in handlers from acting */
+    g_signal_handlers_block_matched(window, G_SIGNAL_MATCH_DATA, 
+				    0, 0, NULL, NULL, shell);
+    
+    /* add our handler for the window deleted signal */
+    g_signal_connect_swapped (
+      window, "delete-event",
+      G_CALLBACK (window_delete_event), shell);
+
+  }
+}
+
+gboolean 
+window_delete_event (EShell *shell, GtkWindow *window) 
+{
+  /* If there is more than one window open then we can safely close this one.  
+     If there is only one then hide it instead of deleteing. */
+  
+  gboolean at_least_one = FALSE;
+  GList *list = e_shell_get_watched_windows (shell);
+  EShellWindow *shell_window;
+
+  /* Check if there is more than one shell window in the list */
+  while (list != NULL) {
+
+    if (E_IS_SHELL_WINDOW (list->data) && at_least_one) {
+      return FALSE;
+    } else if (E_IS_SHELL_WINDOW (list->data)) {
+      at_least_one = TRUE;
+      shell_window = list->data;
+    }
+    list = g_list_next (list);
+  }
+
+  /* If there wasn't more than one then hide the window.*/
+  gtk_window_iconify (GTK_WINDOW(shell_window));
+  gtk_widget_hide (GTK_WIDGET(shell_window));
+
+  return TRUE;
+
+}
+
 GtkWidget *
 e_plugin_lib_get_configure_widget (EPlugin *ep)
 {
@@ -876,6 +1075,27 @@
                          gtk_toggle_button_get_active (button), NULL);
 }
 
+static void
+on_minimize_to_applet_toggled (GtkToggleButton *button, gpointer null)
+{
+  gconf_client_set_bool (client, MINIMIZE_TO_APPLET, 
+			 gtk_toggle_button_get_active (button), NULL);
+}
+
+static void
+on_run_on_startup_toggled (GtkToggleButton *button, gpointer null)
+{
+  gconf_client_set_bool (client, RUN_ON_STARTUP, 
+			 gtk_toggle_button_get_active (button), NULL);
+}
+
+static void
+on_hide_on_startup_toggled (GtkToggleButton *button, gpointer null)
+{
+  gconf_client_set_bool (client, HIDE_ON_STARTUP, 
+			 gtk_toggle_button_get_active (button), NULL);
+}
+
 GtkWidget *
 org_gnome_get_prefs (EPlugin *ep, EConfigHookItemFactoryData *data)
 {
@@ -976,6 +1196,82 @@
   return check;
 }
 
+GtkWidget *
+get_cfg_widget (void)
+{
+  GtkWidget *vbox, *box, *check;
+  GtkWidget *label1, *label2, *label3, *combo;
+  const gchar *markup = "<b>%s</b>";
+  gchar *str1;
+  gchar *str2;
+
+  vbox = gtk_vbox_new (FALSE, 6);
+
+  box = gtk_hbox_new (FALSE, 0);
+
+  check = gtk_check_button_new_with_mnemonic (_("Keep _Evolution running in the background"));
+  g_object_set (check, "active", minimize_to_applet, NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), check, FALSE, FALSE, 0);
+  g_signal_connect (check, "toggled", G_CALLBACK (on_minimize_to_applet_toggled), NULL);
+
+  check = gtk_check_button_new_with_mnemonic (_("_Run Evolution when computer starts"));
+  g_object_set (check, "active", run_on_startup, NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), check, FALSE, FALSE, 0);
+  g_signal_connect (check, "toggled", G_CALLBACK (on_run_on_startup_toggled), NULL);
+
+  check = gtk_check_button_new_with_mnemonic (_("_Hide Evolution on startup"));
+  g_object_set (check, "active", hide_on_startup, NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), check, FALSE, FALSE, 0);
+  g_signal_connect (check, "toggled", G_CALLBACK (on_hide_on_startup_toggled), NULL);
+
+  label1 = gtk_label_new (" ");
+  str1 = g_strdup_printf (markup, _("When new mail arri_ves in"));
+  gtk_label_set_markup_with_mnemonic (GTK_LABEL (label1), str1);
+  g_free (str1);
+    
+  label2 = gtk_label_new (" ");
+  
+  combo = gtk_combo_box_new_text ();
+  gtk_combo_box_append_text (GTK_COMBO_BOX (combo),
+			     n_accounts > 1 ? _("any Inbox") : _("Inbox"));
+  gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("any Folder"));
+  gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 
+			    only_inbox ? 0 : 1);
+  g_signal_connect (combo, "changed", G_CALLBACK (on_combo_changed), NULL);
+  
+  label3 = gtk_label_new (":");
+  /* i18n: ':' is used in the end of the above line (When New Mail Arrives:)*/
+  str2 = g_strdup_printf (markup, _(":"));
+  gtk_label_set_markup (GTK_LABEL (label3), str2);
+  g_free (str2);
+
+  gtk_box_pack_start (GTK_BOX (box), label1, FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (box), label2, FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (box), combo, FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (box), label3, FALSE, FALSE, 0);
+  
+  gtk_box_pack_start (GTK_BOX (vbox), box, FALSE, FALSE, 0);
+
+  check = gtk_check_button_new_with_mnemonic (_("Pla_y a sound"));
+  g_object_set (check, "active", play_sound, NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), check, FALSE, FALSE, 0);
+  g_signal_connect (check, "toggled", G_CALLBACK (on_sound_toggled), NULL);
+  
+  check = gtk_check_button_new_with_mnemonic (_("_Display a notification"));
+  g_object_set (check, "active", show_bubble, NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), check, FALSE, FALSE, 0);
+  g_signal_connect (check, "toggled", G_CALLBACK (on_bubble_toggled), NULL);
+  
+  check = gtk_check_button_new_with_mnemonic (_("_Indicate new messages in the panel"));
+  g_object_set (check, "active", show_count, NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), check, FALSE, FALSE, 0);
+  g_signal_connect (check, "toggled", G_CALLBACK (on_show_panel_toggled), NULL);
+  
+  gtk_widget_show_all (vbox);
+  
+  return vbox;
+}
+
 /*
  *
  * SHOW EVOLUTION CODE