Commit Graph

31 Commits

Author SHA1 Message Date
31fd01398c 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
2009-07-10 14:11:48 -04:00
e2bf5a174a Set the start_in_offline state only when the user chooses to go
offline and not when network goes offline.
2009-07-02 23:45:11 +05:30
fad4af8a3d Prefer GLib basic types over C types. 2009-05-28 12:13:23 -04:00
6f5464f34c Remove trailing whitespace, again. 2009-05-28 12:13:22 -04:00
cc3a98fc1a Merge branch 'master' into kill-bonobo
Conflicts:
	a11y/widgets/ea-combo-button.c
	a11y/widgets/ea-combo-button.h
	addressbook/gui/component/addressbook-component.c
	addressbook/gui/component/addressbook-component.h
	addressbook/gui/component/addressbook-view.c
	addressbook/gui/component/addressbook-view.h
	addressbook/gui/component/component-factory.c
	addressbook/gui/widgets/e-addressbook-view.c
	addressbook/gui/widgets/eab-contact-display.c
	addressbook/gui/widgets/eab-gui-util.h
	addressbook/gui/widgets/eab-menu.c
	addressbook/gui/widgets/eab-menu.h
	addressbook/gui/widgets/eab-popup-control.c
	addressbook/gui/widgets/eab-popup-control.h
	addressbook/gui/widgets/eab-popup.c
	addressbook/gui/widgets/eab-popup.h
	calendar/gui/cal-search-bar.c
	calendar/gui/calendar-commands.c
	calendar/gui/calendar-component.c
	calendar/gui/comp-editor-factory.c
	calendar/gui/comp-editor-factory.h
	calendar/gui/control-factory.c
	calendar/gui/dialogs/comp-editor.c
	calendar/gui/e-cal-component-memo-preview.c
	calendar/gui/e-cal-component-memo-preview.h
	calendar/gui/e-calendar-table.c
	calendar/gui/e-memo-table.c
	calendar/gui/e-memos.c
	calendar/gui/e-tasks.c
	calendar/gui/gnome-cal.c
	calendar/gui/gnome-cal.h
	calendar/gui/itip-bonobo-control.c
	calendar/gui/itip-bonobo-control.h
	calendar/gui/main.c
	calendar/gui/memos-component.c
	calendar/gui/memos-control.c
	calendar/gui/memos-control.h
	calendar/gui/migration.c
	calendar/gui/migration.h
	calendar/gui/tasks-component.c
	calendar/gui/tasks-control.c
	calendar/importers/main.c
	composer/Makefile.am
	composer/e-composer-header-table.c
	composer/e-composer-header.c
	composer/e-composer-header.h
	composer/e-composer-name-header.c
	composer/e-composer-private.c
	composer/e-composer-text-header.c
	composer/e-msg-composer.c
	composer/e-msg-composer.h
	e-util/e-corba-utils.h
	e-util/e-logger.c
	e-util/e-logger.h
	e-util/e-util-labels.c
	e-util/e-util-labels.h
	em-format/em-format.c
	mail/Makefile.am
	mail/e-mail-shell-migrate.c
	mail/em-account-editor.c
	mail/em-account-editor.h
	mail/em-composer-prefs.c
	mail/em-composer-utils.c
	mail/em-composer-utils.h
	mail/em-folder-browser.c
	mail/em-folder-tree-model.c
	mail/em-folder-tree.c
	mail/em-folder-tree.h
	mail/em-folder-utils.c
	mail/em-folder-utils.h
	mail/em-folder-view.c
	mail/em-format-html-display.c
	mail/em-format-html.c
	mail/em-mailer-prefs.c
	mail/em-mailer-prefs.h
	mail/em-message-browser.c
	mail/em-message-browser.h
	mail/em-network-prefs.h
	mail/em-popup.c
	mail/em-utils.c
	mail/importers/Makefile.am
	mail/mail-component-factory.c
	mail/mail-component.c
	mail/mail-config-factory.c
	mail/mail-config-factory.h
	mail/mail-config.c
	mail/mail-dialogs.glade
	mail/mail-types.h
	plugins/calendar-weather/calendar-weather.c
	plugins/mail-account-disable/mail-account-disable.c
	plugins/select-one-source/select-one-source.c
	po/POTFILES.in
	shell/e-component-registry.c
	shell/e-component-registry.h
	shell/e-component-view.c
	shell/e-component-view.h
	shell/e-corba-config-page.c
	shell/e-corba-config-page.h
	shell/e-shell-constants.h
	shell/e-shell-settings-dialog.c
	shell/e-shell-settings-dialog.h
	shell/e-shell-window-commands.c
	shell/e-shell-window.c
	shell/e-shell.h
	shell/e-sidebar.c
	shell/e-sidebar.h
	shell/e-user-creatable-items-handler.c
	shell/e-user-creatable-items-handler.h
	shell/es-menu.c
	shell/es-menu.h
	shell/evolution-component.h
	shell/evolution-config-control.c
	shell/evolution-config-control.h
	shell/evolution-listener.c
	shell/evolution-listener.h
	shell/evolution-shell-component-utils.c
	shell/evolution-shell-component-utils.h
	shell/importer/evolution-importer-client.c
	shell/importer/evolution-importer-client.h
	shell/importer/evolution-importer-listener.c
	shell/importer/evolution-importer-listener.h
	shell/importer/evolution-importer.c
	shell/importer/evolution-importer.h
	shell/importer/evolution-intelligent-importer.c
	shell/importer/evolution-intelligent-importer.h
	shell/importer/intelligent.c
	shell/main.c
	shell/test/evolution-test-component.c
	shell/test/evolution-test-component.h
	widgets/menus/gal-view-instance.c
	widgets/menus/gal-view-menus.c
	widgets/menus/gal-view-menus.h
	widgets/misc/Makefile.am
	widgets/misc/e-activity-handler.c
	widgets/misc/e-activity-handler.h
	widgets/misc/e-charset-picker.c
	widgets/misc/e-combo-button.c
	widgets/misc/e-combo-button.h
	widgets/misc/e-config-page.h
	widgets/misc/e-dropdown-button.c
	widgets/misc/e-dropdown-button.h
	widgets/misc/e-filter-bar.c
	widgets/misc/e-info-label.c
	widgets/misc/e-info-label.h
	widgets/misc/e-multi-config-dialog.c
	widgets/misc/e-multi-config-dialog.h
	widgets/misc/e-search-bar.c
	widgets/misc/e-search-bar.h
	widgets/misc/e-task-bar.c
	widgets/misc/e-task-bar.h
	widgets/misc/e-task-widget.c
	widgets/misc/e-task-widget.h
	widgets/misc/test-dropdown-button.c
	widgets/misc/test-error.c
	widgets/misc/test-info-label.c
	widgets/table/e-table-example-1.c
2009-05-27 08:37:17 -04:00
e4afd3f9fb Remove trailing whitespace, again. 2009-05-26 23:21:02 -04:00
26185023a8 Fix a compiler warning. 2009-05-10 14:48:43 -04:00
c3e0648d8b 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
2009-05-04 09:08:32 -04:00
6e72a236dc ** 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.
2009-05-04 10:10:55 +05:30
cfe3be08ff ** Fixes bug #572962
2009-02-24  Matthew Barnes  <mbarnes@redhat.com>

	** Fixes bug #572962

	* e-shell-window.c (setup_nm_support):
	Pass e_shell_dbus_initialise() the right type of object,
	and fix the incorrect function declaration.

	* e-shell-nm.c (e_shell_network_monitor):
	Go offline when we see NM_STATE_ASLEEP from NetworkManager.


svn path=/trunk/; revision=37320
2009-02-24 23:46:11 +00:00
24abc4f173 Go offline when we see NM_STATE_ASLEEP from NetworkManager (#572962).
svn path=/branches/kill-bonobo/; revision=37318
2009-02-24 18:23:03 +00:00
04531b1c0f ** Fixes bug #564416
2008-12-14  Matthew Barnes  <mbarnes@redhat.com>

	** Fixes bug #564416

	* shell/e-shell-nm.c:
	We've been listening for obsolete D-Bus signals.
	Update to NetworkManager's current D-Bus API.


svn path=/trunk/; revision=36878
2008-12-15 04:51:33 +00:00
b7333387e8 - Fix NetworkManager connection tracking.
- Implement offline preparation as an EActivity that gets broadcast in
  a signal to shell modules.  Offline preparations are complete when the
  last EActivity reference is dropped.

- Bind some of the composer preferences to EShellSettings properties.

svn path=/branches/kill-bonobo/; revision=36875
2008-12-14 02:14:41 +00:00
85b2913a38 Merge revisions 36534:36684 from trunk.
svn path=/branches/kill-bonobo/; revision=36685
2008-10-24 23:52:05 +00:00
5ce1bbbbc8 Matthew Barnes <mbarnes@redhat.com> ** Fix for bug #548469 (Drop support for deprecated libnm-glib).
svn path=/trunk/; revision=36631
2008-10-17 05:18:16 +00:00
1bed00795b Baseline cut at the Calendar sidebar and module. Pretty much identical
to Tasks and Memos so far.  Now for the interesting part...

svn path=/branches/kill-bonobo/; revision=36573
2008-10-06 17:41:31 +00:00
b2cda1d0c6 Merge revisions 36016:36533 from trunk.
svn path=/branches/kill-bonobo/; revision=36534
2008-10-01 20:56:04 +00:00
b7fc5caefe License Changes from GPL to LGPL
svn path=/trunk/; revision=36313
2008-09-12 16:19:36 +00:00
cbe90f148a Fix a compilation error.
svn path=/branches/kill-bonobo/; revision=36308
2008-09-11 15:49:34 +00:00
c0a255eb90 Merge revisions 36016:36303 from trunk.
svn path=/branches/kill-bonobo/; revision=36307
2008-09-11 15:34:29 +00:00
fd6cd9e3a6 Progress update:
- Discard libnm-glib method of monitoring network connectivity.
  - Decided to make EShell a singleton GObject after all.  Makes the
    design cleaner, despite having to pass a singleton instance around.
  - Make the switcher button style persistent.


svn path=/branches/kill-bonobo/; revision=36043
2008-08-23 15:36:32 +00:00
879d84ab6e Coding style cleanups.
svn path=/trunk/; revision=36025
2008-08-19 15:02:36 +00:00
71a2b97615 Patch from James Westby <jw+debian@jameswestby.net>: Fix for bug #518103 (Check online status from NetworkManager at startup instead of using the last-used-state)
svn path=/trunk/; revision=35420
2008-04-26 14:46:21 +00:00
bc2c2171c4 ** Fix for bnc #173186
2008-02-18  Srinivasa Ragavan  <sragavan@novell.com>

	** Fix for bnc #173186

	* e-shell-nm.c: (e_shell_network_monitor): Upstreamed Fejj's OpenSUSE
	patch. Crash while quitting.

svn path=/trunk/; revision=35038
2008-02-18 04:34:05 +00:00
f588b4ffed ** Fix for bnc #159736. Patch from OpenSUSE.
2008-02-18  Srinivasa Ragavan  <sragavan@novell.com>

	** Fix for bnc #159736. Patch from OpenSUSE.

	* e-shell-nm.c: (e_shell_network_monitor):



svn path=/trunk/; revision=35034
2008-02-17 20:25:38 +00:00
9e4fcb29cf ** Remove trailing whitespace from source code.
2007-11-14  Matthew Barnes  <mbarnes@redhat.com>

	** Remove trailing whitespace from source code.


svn path=/trunk/; revision=34537
2007-11-14 22:04:21 +00:00
8e47917e8c Update FSF address in header comments (#469886). Patch from Tobias
2007-09-02  Matthew Barnes  <mbarnes@redhat.com>

	* Update FSF address in header comments (#469886).
	  Patch from Tobias Mueller.


svn path=/trunk/; revision=34151
2007-09-02 04:19:22 +00:00
c6612c8d03 Fix warnings at build-time, and clean up the connections to the D-Bus on
2006-07-27  Bastien Nocera  <hadess@hadess.net>

	* e-shell-nm-glib.c: (e_shell_glib_network_monitor),
	(e_shell_nm_glib_initialise), (e_shell_nm_glib_dispose):
	* e-shell-nm.c: (e_shell_dbus_dispose):
	* e-shell-window.c: (impl_dispose): Fix warnings at build-time, and
	clean up the connections to the D-Bus on exit (Closes: #332387)

svn path=/trunk/; revision=32425
2006-07-27 09:42:18 +00:00
cb4e88c994 #include <string.h>
svn path=/trunk/; revision=31837
2006-04-19 21:15:24 +00:00
ab7c700749 Intercept the Disconnected signal and setup a timeout to try and reconnect
2006-04-18  Jeffrey Stedfast  <fejj@novell.com>

	* e-shell-nm.c (e_shell_network_monitor): Intercept the
	Disconnected signal and setup a timeout to try and reconnect when
	the dbus daemon comes back up.

svn path=/trunk/; revision=31828
2006-04-18 15:51:43 +00:00
87a09855fa Evolution is now Network Aware, the day of complete awareness beckons, The
2005-12-22  Shreyas Srinivasan  <sshreyas@novell.com>

	* Evolution is now Network Aware, the day of complete
	awareness beckons, The machines are taking over...

	* Network Manager support for evolution

svn path=/trunk/; revision=30926
2005-12-22 02:12:34 +00:00