From 60386356e322c0ebe3a0101a616752c0e557491e Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 20 Apr 2013 11:22:58 -0400 Subject: Remove "Search for sender photograph only in local address books". This was added as part of bug 360184 but no justification was given for the "local-only" part. My Spidey sense tells me it was a hack- around for the old implementation's tendency to freeze the UI while searching for a photograph. So the "local-only" option really just meant "don't freeze the UI for very long, please". The new EPhotoCache-based implementation in 3.8 NEVER freezes the UI, so the "local-only" option is no longer needed. If a remote address book is slow or unresponsive we simply cancel the async photo lookup when the user moves on to another email. --- modules/settings/Makefile.am | 2 - modules/settings/e-settings-photo-cache.c | 92 ---------------------------- modules/settings/e-settings-photo-cache.h | 65 -------------------- modules/settings/evolution-module-settings.c | 2 - 4 files changed, 161 deletions(-) delete mode 100644 modules/settings/e-settings-photo-cache.c delete mode 100644 modules/settings/e-settings-photo-cache.h (limited to 'modules/settings') diff --git a/modules/settings/Makefile.am b/modules/settings/Makefile.am index 61cf5688d4..e8e66b2a58 100644 --- a/modules/settings/Makefile.am +++ b/modules/settings/Makefile.am @@ -37,8 +37,6 @@ module_settings_la_SOURCES = \ e-settings-meeting-time-selector.h \ e-settings-name-selector-entry.c \ e-settings-name-selector-entry.h \ - e-settings-photo-cache.c \ - e-settings-photo-cache.h \ e-settings-spell-entry.c \ e-settings-spell-entry.h \ e-settings-web-view.c \ diff --git a/modules/settings/e-settings-photo-cache.c b/modules/settings/e-settings-photo-cache.c deleted file mode 100644 index fe83148290..0000000000 --- a/modules/settings/e-settings-photo-cache.c +++ /dev/null @@ -1,92 +0,0 @@ -/* - * e-settings-photo-cache.c - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) version 3. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see - * - */ - -#include "e-settings-photo-cache.h" - -#define E_SETTINGS_PHOTO_CACHE_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_SETTINGS_PHOTO_CACHE, ESettingsPhotoCachePrivate)) - -struct _ESettingsPhotoCachePrivate { - gint placeholder; -}; - -G_DEFINE_DYNAMIC_TYPE ( - ESettingsPhotoCache, - e_settings_photo_cache, - E_TYPE_EXTENSION) - -static void -settings_photo_cache_constructed (GObject *object) -{ - EExtension *extension; - EExtensible *extensible; - GSettings *settings; - - extension = E_EXTENSION (object); - extensible = e_extension_get_extensible (extension); - - settings = g_settings_new ("org.gnome.evolution.mail"); - - g_settings_bind ( - settings, "photo-local", - extensible, "local-only", - G_SETTINGS_BIND_GET); - - g_object_unref (settings); - - /* Chain up to parent's constructed() method. */ - G_OBJECT_CLASS (e_settings_photo_cache_parent_class)-> - constructed (object); -} - -static void -e_settings_photo_cache_class_init (ESettingsPhotoCacheClass *class) -{ - GObjectClass *object_class; - EExtensionClass *extension_class; - - g_type_class_add_private (class, sizeof (ESettingsPhotoCachePrivate)); - - object_class = G_OBJECT_CLASS (class); - object_class->constructed = settings_photo_cache_constructed; - - extension_class = E_EXTENSION_CLASS (class); - extension_class->extensible_type = E_TYPE_PHOTO_CACHE; -} - -static void -e_settings_photo_cache_class_finalize (ESettingsPhotoCacheClass *class) -{ -} - -static void -e_settings_photo_cache_init (ESettingsPhotoCache *extension) -{ - extension->priv = E_SETTINGS_PHOTO_CACHE_GET_PRIVATE (extension); -} - -void -e_settings_photo_cache_type_register (GTypeModule *type_module) -{ - /* XXX G_DEFINE_DYNAMIC_TYPE declares a static type registration - * function, so we have to wrap it with a public function in - * order to register types from a separate compilation unit. */ - e_settings_photo_cache_register_type (type_module); -} - diff --git a/modules/settings/e-settings-photo-cache.h b/modules/settings/e-settings-photo-cache.h deleted file mode 100644 index a01de9474c..0000000000 --- a/modules/settings/e-settings-photo-cache.h +++ /dev/null @@ -1,65 +0,0 @@ -/* - * e-settings-photo-cache.h - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) version 3. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see - * - */ - -#ifndef E_SETTINGS_PHOTO_CACHE_H -#define E_SETTINGS_PHOTO_CACHE_H - -#include - -/* Standard GObject macros */ -#define E_TYPE_SETTINGS_PHOTO_CACHE \ - (e_settings_photo_cache_get_type ()) -#define E_SETTINGS_PHOTO_CACHE(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST \ - ((obj), E_TYPE_SETTINGS_PHOTO_CACHE, ESettingsPhotoCache)) -#define E_SETTINGS_PHOTO_CACHE_CLASS(cls) \ - (G_TYPE_CHECK_CLASS_CAST \ - ((cls), E_TYPE_SETTINGS_PHOTO_CACHE, ESettingsPhotoCacheClass)) -#define E_IS_SETTINGS_PHOTO_CACHE(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE \ - ((obj), E_TYPE_SETTINGS_PHOTO_CACHE)) -#define E_IS_SETTINGS_PHOTO_CACHE_CLASS(cls) \ - (G_TYPE_CHECK_CLASS_TYPE \ - ((cls), E_TYPE_SETTINGS_PHOTO_CACHE)) -#define E_SETTINGS_PHOTO_CACHE_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS \ - ((obj), E_TYPE_SETTINGS_PHOTO_CACHE, ESettingsPhotoCacheClass)) - -G_BEGIN_DECLS - -typedef struct _ESettingsPhotoCache ESettingsPhotoCache; -typedef struct _ESettingsPhotoCacheClass ESettingsPhotoCacheClass; -typedef struct _ESettingsPhotoCachePrivate ESettingsPhotoCachePrivate; - -struct _ESettingsPhotoCache { - EExtension parent; - ESettingsPhotoCachePrivate *priv; -}; - -struct _ESettingsPhotoCacheClass { - EExtensionClass parent_class; -}; - -GType e_settings_photo_cache_get_type (void) G_GNUC_CONST; -void e_settings_photo_cache_type_register - (GTypeModule *type_module); - -G_END_DECLS - -#endif /* E_SETTINGS_PHOTO_CACHE_H */ - diff --git a/modules/settings/evolution-module-settings.c b/modules/settings/evolution-module-settings.c index 94caf05a6e..52d55f454b 100644 --- a/modules/settings/evolution-module-settings.c +++ b/modules/settings/evolution-module-settings.c @@ -28,7 +28,6 @@ #include "e-settings-meeting-store.h" #include "e-settings-meeting-time-selector.h" #include "e-settings-name-selector-entry.h" -#include "e-settings-photo-cache.h" #include "e-settings-spell-entry.h" #include "e-settings-web-view.h" #include "e-settings-web-view-gtkhtml.h" @@ -53,7 +52,6 @@ e_module_load (GTypeModule *type_module) e_settings_meeting_store_type_register (type_module); e_settings_meeting_time_selector_type_register (type_module); e_settings_name_selector_entry_type_register (type_module); - e_settings_photo_cache_type_register (type_module); e_settings_spell_entry_type_register (type_module); e_settings_web_view_type_register (type_module); e_settings_web_view_gtkhtml_type_register (type_module); -- cgit v1.2.3