GNOME.org
 

[evolution-data-server] evo-I#1698 - Bundle legacy icons removed from adwaita-icon-theme

commit 08838da1422588dd8325a765a5ee3b86a2a854ef
Author: Milan Crha <mcrha redhat com>
Date:   Thu Nov 18 14:51:14 2021 +0100

    evo-I#1698 - Bundle legacy icons removed from adwaita-icon-theme
    
    Related to https://gitlab.gnome.org/GNOME/evolution/-/issues/1698

 CMakeLists.txt                                     |   2 +
 cmake/modules/IconCache.cmake                      |  76 +++++++++++++++++++++
 data/CMakeLists.txt                                |  33 +++++++++
 data/hicolor_legacy_16x16_appointment-missed.png   | Bin 0 -> 780 bytes
 data/hicolor_legacy_16x16_appointment-soon.png     | Bin 0 -> 703 bytes
 data/hicolor_legacy_16x16_dialog-password.png      | Bin 0 -> 551 bytes
 data/hicolor_legacy_16x16_dialog-warning.png       | Bin 0 -> 570 bytes
 data/hicolor_legacy_22x22_appointment-missed.png   | Bin 0 -> 1436 bytes
 data/hicolor_legacy_22x22_appointment-soon.png     | Bin 0 -> 1244 bytes
 data/hicolor_legacy_22x22_dialog-password.png      | Bin 0 -> 653 bytes
 data/hicolor_legacy_22x22_dialog-warning.png       | Bin 0 -> 945 bytes
 data/hicolor_legacy_24x24_appointment-missed.png   | Bin 0 -> 1509 bytes
 data/hicolor_legacy_24x24_appointment-soon.png     | Bin 0 -> 1292 bytes
 data/hicolor_legacy_24x24_dialog-password.png      | Bin 0 -> 640 bytes
 data/hicolor_legacy_24x24_dialog-warning.png       | Bin 0 -> 969 bytes
 data/hicolor_legacy_256x256_appointment-missed.png | Bin 0 -> 37868 bytes
 data/hicolor_legacy_256x256_appointment-soon.png   | Bin 0 -> 51553 bytes
 data/hicolor_legacy_256x256_dialog-password.png    | Bin 0 -> 17046 bytes
 data/hicolor_legacy_256x256_dialog-warning.png     | Bin 0 -> 25592 bytes
 data/hicolor_legacy_32x32_appointment-missed.png   | Bin 0 -> 2360 bytes
 data/hicolor_legacy_32x32_appointment-soon.png     | Bin 0 -> 2212 bytes
 data/hicolor_legacy_32x32_dialog-password.png      | Bin 0 -> 1117 bytes
 data/hicolor_legacy_32x32_dialog-warning.png       | Bin 0 -> 1584 bytes
 data/hicolor_legacy_48x48_appointment-missed.png   | Bin 0 -> 4455 bytes
 data/hicolor_legacy_48x48_appointment-soon.png     | Bin 0 -> 4585 bytes
 data/hicolor_legacy_48x48_dialog-password.png      | Bin 0 -> 1749 bytes
 data/hicolor_legacy_48x48_dialog-warning.png       | Bin 0 -> 2640 bytes
 evolution-data-server.pc.in                        |   1 +
 src/libedataserverui/CMakeLists.txt                |   1 +
 .../e-credentials-prompter-impl-password.c         |   4 ++
 src/libedataserverui/e-trust-prompt.c              |   3 +
 src/libedataserverui/libedataserverui-private.c    |  20 ++++++
 src/libedataserverui/libedataserverui-private.h    |   1 +
 src/modules/trust-prompt/CMakeLists.txt            |   2 +-
 src/modules/trust-prompt/trust-prompt-gtk.c        |  14 ++++
 .../evolution-alarm-notify.c                       |   7 +-
 36 files changed, 158 insertions(+), 6 deletions(-)
---
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a02f4bbc8..7d3aa14f7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -195,6 +195,7 @@ set(privdatadir "${SHARE_INSTALL_PREFIX}/${PROJECT_NAME}")
 set(privincludedir "${INCLUDE_INSTALL_DIR}/${PROJECT_NAME}")
 set(privlibdir "${LIB_INSTALL_DIR}/${PROJECT_NAME}")
 set(privlibexecdir "${LIBEXEC_INSTALL_DIR}/${PROJECT_NAME}")
+set(icondir "${privdatadir}/icons")
 
 SET(CMAKE_INSTALL_RPATH "${privlibdir}")
 
@@ -273,6 +274,7 @@ include(InstalledTests)
 include(PkgConfigEx)
 include(SetupBuildFlags)
 include(UninstallTarget)
+include(IconCache)
 
 include(FindGettext)
 include(I18n)
diff --git a/cmake/modules/IconCache.cmake b/cmake/modules/IconCache.cmake
new file mode 100644
index 000000000..145b843f1
--- /dev/null
+++ b/cmake/modules/IconCache.cmake
@@ -0,0 +1,76 @@
+# IconCache.cmake
+#
+# This is required here only to have defined target 'uninstall'
+# in the same directory.
+#
+# Macros:
+# add_icon_cache_files(_destdir _fileslistvar ...)
+#    adds rules to install icons to icon cache directory with prefix _destdir;
+#    the other arguments are one or more list variables with file names.
+
+include(UninstallTarget)
+
+macro(get_one_icon_component _instring _outvalue _outrest)
+       string(FIND "${_instring}" "_" _pos)
+       if(_pos EQUAL -1)
+               message(FATAL_ERROR "get_one_icon_component() failed to get one component from 
'${_instring}'")
+       endif(_pos EQUAL -1)
+
+       math(EXPR _posinc "${_pos}+1")
+
+       string(SUBSTRING "${_instring}" 0 ${_pos} ${_outvalue})
+       string(SUBSTRING "${_instring}" ${_posinc} -1 ${_outrest})
+endmacro(get_one_icon_component)
+
+macro(split_icon_components _infilename _outtheme _outcontext _outsize _outiconfile)
+       set(_rest "${_infilename}")
+
+       get_one_icon_component("${_rest}" ${_outtheme} _rest)
+       get_one_icon_component("${_rest}" ${_outcontext} _rest)
+       get_one_icon_component("${_rest}" ${_outsize} _rest)
+       set(${_outiconfile} "${_rest}")
+endmacro(split_icon_components)
+
+find_program(GTK_UPDATE_ICON_CACHE gtk-update-icon-cache)
+if(NOT GTK_UPDATE_ICON_CACHE)
+       message(WARNING "gtk-update-icon-cache not found. Make sure to call ${GTK_UPDATE_ICON_CACHE} -f -t 
\"${SHARE_INSTALL_PREFIX}/icons/hicolor\" after install and uninstall")
+endif(NOT GTK_UPDATE_ICON_CACHE)
+
+set(_update_icon_cache_cmd ${GTK_UPDATE_ICON_CACHE} -f -t "${SHARE_INSTALL_PREFIX}/icons/hicolor")
+
+macro(process_icons _destdir _fileslistvar _install_codevar)
+       foreach(srcfile IN LISTS ${_fileslistvar})
+               split_icon_components(${srcfile} theme context size iconfile)
+               install(FILES ${srcfile}
+                       DESTINATION ${_destdir}/icons/${theme}/${size}/${context}
+                       RENAME ${iconfile}
+               )
+               set(${_install_codevar} "${${_install_codevar}}
+                       COMMAND ${CMAKE_COMMAND} -E copy_if_different 
\"${CMAKE_CURRENT_SOURCE_DIR}/${srcfile}\" \"${_destdir}/icons/${theme}/${size}/${context}/${iconfile}\""
+               )
+       endforeach(srcfile)
+endmacro(process_icons)
+
+macro(add_icon_cache_files _destdir _fileslistvar)
+       set(_install_code)
+
+       foreach(_filesvar ${_fileslistvar} ${ARGN})
+               process_icons("${_destdir}" ${_filesvar} _install_code)
+       endforeach(_filesvar)
+
+       if(GTK_UPDATE_ICON_CACHE)
+               install(CODE
+                       "if(\"\$ENV{DESTDIR}\" STREQUAL \"\")
+                               execute_process(${_install_code}
+                                       COMMAND ${CMAKE_COMMAND} -E chdir . ${_update_icon_cache_cmd}
+                               )
+                       endif(\"\$ENV{DESTDIR}\" STREQUAL \"\")")
+       endif(GTK_UPDATE_ICON_CACHE)
+endmacro(add_icon_cache_files)
+
+if(GTK_UPDATE_ICON_CACHE)
+       add_custom_command(TARGET uninstall POST_BUILD
+               COMMAND ${CMAKE_COMMAND} -E chdir . ${_update_icon_cache_cmd}
+               COMMENT "Updating icon cache in '${SHARE_INSTALL_PREFIX}/icons/hicolor'"
+       )
+endif(GTK_UPDATE_ICON_CACHE)
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index de24e1946..f8a8e7f3a 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -87,3 +87,36 @@ set(IMAGES
 install(FILES ${IMAGES}
        DESTINATION ${imagesdir}
 )
+
+# ********************************
+# Fallback icons
+# ********************************
+
+set(private_icons
+       hicolor_legacy_16x16_appointment-missed.png
+       hicolor_legacy_22x22_appointment-missed.png
+       hicolor_legacy_24x24_appointment-missed.png
+       hicolor_legacy_32x32_appointment-missed.png
+       hicolor_legacy_48x48_appointment-missed.png
+       hicolor_legacy_256x256_appointment-missed.png
+       hicolor_legacy_16x16_appointment-soon.png
+       hicolor_legacy_22x22_appointment-soon.png
+       hicolor_legacy_24x24_appointment-soon.png
+       hicolor_legacy_32x32_appointment-soon.png
+       hicolor_legacy_48x48_appointment-soon.png
+       hicolor_legacy_256x256_appointment-soon.png
+       hicolor_legacy_16x16_dialog-password.png
+       hicolor_legacy_22x22_dialog-password.png
+       hicolor_legacy_24x24_dialog-password.png
+       hicolor_legacy_32x32_dialog-password.png
+       hicolor_legacy_48x48_dialog-password.png
+       hicolor_legacy_256x256_dialog-password.png
+       hicolor_legacy_16x16_dialog-warning.png
+       hicolor_legacy_22x22_dialog-warning.png
+       hicolor_legacy_24x24_dialog-warning.png
+       hicolor_legacy_32x32_dialog-warning.png
+       hicolor_legacy_48x48_dialog-warning.png
+       hicolor_legacy_256x256_dialog-warning.png
+)
+
+add_icon_cache_files("${privdatadir}" private_icons)
diff --git a/data/hicolor_legacy_16x16_appointment-missed.png 
b/data/hicolor_legacy_16x16_appointment-missed.png
new file mode 100644
index 000000000..2b5cda829
Binary files /dev/null and b/data/hicolor_legacy_16x16_appointment-missed.png differ
diff --git a/data/hicolor_legacy_16x16_appointment-soon.png b/data/hicolor_legacy_16x16_appointment-soon.png
new file mode 100644
index 000000000..e24a1c03a
Binary files /dev/null and b/data/hicolor_legacy_16x16_appointment-soon.png differ
diff --git a/data/hicolor_legacy_16x16_dialog-password.png b/data/hicolor_legacy_16x16_dialog-password.png
new file mode 100644
index 000000000..66aa8ba72
Binary files /dev/null and b/data/hicolor_legacy_16x16_dialog-password.png differ
diff --git a/data/hicolor_legacy_16x16_dialog-warning.png b/data/hicolor_legacy_16x16_dialog-warning.png
new file mode 100644
index 000000000..b576a6bee
Binary files /dev/null and b/data/hicolor_legacy_16x16_dialog-warning.png differ
diff --git a/data/hicolor_legacy_22x22_appointment-missed.png 
b/data/hicolor_legacy_22x22_appointment-missed.png
new file mode 100644
index 000000000..2464f1ec0
Binary files /dev/null and b/data/hicolor_legacy_22x22_appointment-missed.png differ
diff --git a/data/hicolor_legacy_22x22_appointment-soon.png b/data/hicolor_legacy_22x22_appointment-soon.png
new file mode 100644
index 000000000..aa8b6467a
Binary files /dev/null and b/data/hicolor_legacy_22x22_appointment-soon.png differ
diff --git a/data/hicolor_legacy_22x22_dialog-password.png b/data/hicolor_legacy_22x22_dialog-password.png
new file mode 100644
index 000000000..3d821ca14
Binary files /dev/null and b/data/hicolor_legacy_22x22_dialog-password.png differ
diff --git a/data/hicolor_legacy_22x22_dialog-warning.png b/data/hicolor_legacy_22x22_dialog-warning.png
new file mode 100644
index 000000000..efd0d7723
Binary files /dev/null and b/data/hicolor_legacy_22x22_dialog-warning.png differ
diff --git a/data/hicolor_legacy_24x24_appointment-missed.png 
b/data/hicolor_legacy_24x24_appointment-missed.png
new file mode 100644
index 000000000..852dcd59e
Binary files /dev/null and b/data/hicolor_legacy_24x24_appointment-missed.png differ
diff --git a/data/hicolor_legacy_24x24_appointment-soon.png b/data/hicolor_legacy_24x24_appointment-soon.png
new file mode 100644
index 000000000..0e9eb559d
Binary files /dev/null and b/data/hicolor_legacy_24x24_appointment-soon.png differ
diff --git a/data/hicolor_legacy_24x24_dialog-password.png b/data/hicolor_legacy_24x24_dialog-password.png
new file mode 100644
index 000000000..4e786e1a9
Binary files /dev/null and b/data/hicolor_legacy_24x24_dialog-password.png differ
diff --git a/data/hicolor_legacy_24x24_dialog-warning.png b/data/hicolor_legacy_24x24_dialog-warning.png
new file mode 100644
index 000000000..d77f17c98
Binary files /dev/null and b/data/hicolor_legacy_24x24_dialog-warning.png differ
diff --git a/data/hicolor_legacy_256x256_appointment-missed.png 
b/data/hicolor_legacy_256x256_appointment-missed.png
new file mode 100644
index 000000000..4786bbf5e
Binary files /dev/null and b/data/hicolor_legacy_256x256_appointment-missed.png differ
diff --git a/data/hicolor_legacy_256x256_appointment-soon.png 
b/data/hicolor_legacy_256x256_appointment-soon.png
new file mode 100644
index 000000000..db2a83b14
Binary files /dev/null and b/data/hicolor_legacy_256x256_appointment-soon.png differ
diff --git a/data/hicolor_legacy_256x256_dialog-password.png b/data/hicolor_legacy_256x256_dialog-password.png
new file mode 100644
index 000000000..3506e4450
Binary files /dev/null and b/data/hicolor_legacy_256x256_dialog-password.png differ
diff --git a/data/hicolor_legacy_256x256_dialog-warning.png b/data/hicolor_legacy_256x256_dialog-warning.png
new file mode 100644
index 000000000..d1798a937
Binary files /dev/null and b/data/hicolor_legacy_256x256_dialog-warning.png differ
diff --git a/data/hicolor_legacy_32x32_appointment-missed.png 
b/data/hicolor_legacy_32x32_appointment-missed.png
new file mode 100644
index 000000000..f2dcaec1c
Binary files /dev/null and b/data/hicolor_legacy_32x32_appointment-missed.png differ
diff --git a/data/hicolor_legacy_32x32_appointment-soon.png b/data/hicolor_legacy_32x32_appointment-soon.png
new file mode 100644
index 000000000..4e539e1fb
Binary files /dev/null and b/data/hicolor_legacy_32x32_appointment-soon.png differ
diff --git a/data/hicolor_legacy_32x32_dialog-password.png b/data/hicolor_legacy_32x32_dialog-password.png
new file mode 100644
index 000000000..5a2e6569b
Binary files /dev/null and b/data/hicolor_legacy_32x32_dialog-password.png differ
diff --git a/data/hicolor_legacy_32x32_dialog-warning.png b/data/hicolor_legacy_32x32_dialog-warning.png
new file mode 100644
index 000000000..e9fb123a9
Binary files /dev/null and b/data/hicolor_legacy_32x32_dialog-warning.png differ
diff --git a/data/hicolor_legacy_48x48_appointment-missed.png 
b/data/hicolor_legacy_48x48_appointment-missed.png
new file mode 100644
index 000000000..217fcab22
Binary files /dev/null and b/data/hicolor_legacy_48x48_appointment-missed.png differ
diff --git a/data/hicolor_legacy_48x48_appointment-soon.png b/data/hicolor_legacy_48x48_appointment-soon.png
new file mode 100644
index 000000000..9b298f262
Binary files /dev/null and b/data/hicolor_legacy_48x48_appointment-soon.png differ
diff --git a/data/hicolor_legacy_48x48_dialog-password.png b/data/hicolor_legacy_48x48_dialog-password.png
new file mode 100644
index 000000000..196751460
Binary files /dev/null and b/data/hicolor_legacy_48x48_dialog-password.png differ
diff --git a/data/hicolor_legacy_48x48_dialog-warning.png b/data/hicolor_legacy_48x48_dialog-warning.png
new file mode 100644
index 000000000..8239ccae6
Binary files /dev/null and b/data/hicolor_legacy_48x48_dialog-warning.png differ
diff --git a/evolution-data-server.pc.in b/evolution-data-server.pc.in
index b8236a3ea..4e6296a3d 100644
--- a/evolution-data-server.pc.in
+++ b/evolution-data-server.pc.in
@@ -6,6 +6,7 @@ datarootdir=@SHARE_INSTALL_PREFIX@
 datadir=@SHARE_INSTALL_PREFIX@
 privdatadir=@privdatadir@
 privlibexecdir=@privlibexecdir@
+icondir=@icondir@
 
 addressbookdbusservicename=@ADDRESS_BOOK_DBUS_SERVICE_NAME@
 calendardbusservicename=@CALENDAR_DBUS_SERVICE_NAME@
diff --git a/src/libedataserverui/CMakeLists.txt b/src/libedataserverui/CMakeLists.txt
index 63f594fbe..d7b6735f2 100644
--- a/src/libedataserverui/CMakeLists.txt
+++ b/src/libedataserverui/CMakeLists.txt
@@ -53,6 +53,7 @@ target_compile_definitions(edataserverui PRIVATE
        -DLIBEDATASERVERUI_COMPILATION
        -DE_DATA_SERVER_PREFIX=\"${CMAKE_INSTALL_PREFIX}\"
        -DE_DATA_SERVER_UIMODULEDIR=\"${uimoduledir}\"
+       -DE_DATA_SERVER_ICONDIR=\"${icondir}\"
 )
 
 target_compile_options(edataserverui PUBLIC
diff --git a/src/libedataserverui/e-credentials-prompter-impl-password.c 
b/src/libedataserverui/e-credentials-prompter-impl-password.c
index bb22386ee..c2409fa14 100644
--- a/src/libedataserverui/e-credentials-prompter-impl-password.c
+++ b/src/libedataserverui/e-credentials-prompter-impl-password.c
@@ -24,6 +24,8 @@
 
 #include <libedataserver/libedataserver.h>
 
+#include "libedataserverui-private.h"
+
 #include "e-credentials-prompter.h"
 #include "e-credentials-prompter-impl-password.h"
 
@@ -544,6 +546,8 @@ e_credentials_prompter_impl_password_class_init (ECredentialsPrompterImplPasswor
        prompter_impl_class->authentication_methods = (const gchar * const *) authentication_methods;
        prompter_impl_class->process_prompt = e_credentials_prompter_impl_password_process_prompt;
        prompter_impl_class->cancel_prompt = e_credentials_prompter_impl_password_cancel_prompt;
+
+       _libedataserverui_init_icon_theme ();
 }
 
 static void
diff --git a/src/libedataserverui/e-trust-prompt.c b/src/libedataserverui/e-trust-prompt.c
index db0e53ad0..4604c33ad 100644
--- a/src/libedataserverui/e-trust-prompt.c
+++ b/src/libedataserverui/e-trust-prompt.c
@@ -28,6 +28,7 @@
 
 #include "camel/camel.h"
 #include "libedataserver/libedataserver.h"
+#include "libedataserverui-private.h"
 
 #include "e-trust-prompt.h"
 
@@ -106,6 +107,8 @@ trust_prompt_show (GtkWindow *parent,
        gsize length;
        gint row = 0;
 
+       _libedataserverui_init_icon_theme ();
+
        dialog = gtk_dialog_new_with_buttons (
                _("Certificate trust..."), parent, GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
                _("_Cancel"), GTK_RESPONSE_CANCEL,
diff --git a/src/libedataserverui/libedataserverui-private.c b/src/libedataserverui/libedataserverui-private.c
index 847d34e31..e303a87c2 100644
--- a/src/libedataserverui/libedataserverui-private.c
+++ b/src/libedataserverui/libedataserverui-private.c
@@ -18,6 +18,7 @@
 #include "evolution-data-server-config.h"
 
 #include <glib.h>
+#include <gtk/gtk.h>
 
 #include "libedataserver/libedataserver.h"
 #include "libedataserver/libedataserver-private.h"
@@ -47,3 +48,22 @@ _libedataserverui_load_modules (void)
                g_list_free_full (module_types, (GDestroyNotify) g_type_module_unuse);
        }
 }
+
+/*
+ * _libedataserverui_init_icon_theme:
+ *
+ * Adds fallback icons to the gtk+ default theme search path.
+ *
+ * Since: 3.44
+ */
+void
+_libedataserverui_init_icon_theme (void)
+{
+       static gboolean icons_added = FALSE;
+
+       if (!icons_added) {
+               icons_added = TRUE;
+
+               gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (), E_DATA_SERVER_ICONDIR);
+       }
+}
diff --git a/src/libedataserverui/libedataserverui-private.h b/src/libedataserverui/libedataserverui-private.h
index 61762bb7a..6c3e18389 100644
--- a/src/libedataserverui/libedataserverui-private.h
+++ b/src/libedataserverui/libedataserverui-private.h
@@ -23,6 +23,7 @@
 G_BEGIN_DECLS
 
 void           _libedataserverui_load_modules          (void);
+void           _libedataserverui_init_icon_theme       (void);
 
 G_END_DECLS
 
diff --git a/src/modules/trust-prompt/CMakeLists.txt b/src/modules/trust-prompt/CMakeLists.txt
index b3f1f883c..3ae1a46e8 100644
--- a/src/modules/trust-prompt/CMakeLists.txt
+++ b/src/modules/trust-prompt/CMakeLists.txt
@@ -26,7 +26,7 @@ set(sources
        trust-prompt.h
        ${TRUST_PROMPT_SOURCES}
 )
-set(extra_defines)
+set(extra_defines -DE_DATA_SERVER_ICONDIR=\"${icondir}\")
 set(extra_cflags ${TRUST_PROMPT_CFLAGS})
 set(extra_incdirs ${TRUST_PROMPT_INCLUDE_DIRS})
 set(extra_ldflags ${TRUST_PROMPT_LDFLAGS})
diff --git a/src/modules/trust-prompt/trust-prompt-gtk.c b/src/modules/trust-prompt/trust-prompt-gtk.c
index 16fc011df..3d6d7f78e 100644
--- a/src/modules/trust-prompt/trust-prompt-gtk.c
+++ b/src/modules/trust-prompt/trust-prompt-gtk.c
@@ -95,6 +95,18 @@ trust_prompt_response_cb (GtkWidget *dialog,
        e_user_prompter_server_extension_response (extension, prompt_id, response, NULL);
 }
 
+static void
+_init_icon_theme (void)
+{
+       static gboolean icons_added = FALSE;
+
+       if (!icons_added) {
+               icons_added = TRUE;
+
+               gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (), E_DATA_SERVER_ICONDIR);
+       }
+}
+
 gboolean
 trust_prompt_show (EUserPrompterServerExtension *extension,
                    gint prompt_id,
@@ -113,6 +125,8 @@ trust_prompt_show (EUserPrompterServerExtension *extension,
        gchar *tmp;
        gint row = 0;
 
+       _init_icon_theme ();
+
        dialog = gtk_dialog_new_with_buttons (
                _("Certificate trust..."), NULL, 0,
                _("_Reject"), GTK_RESPONSE_REJECT,
diff --git a/src/services/evolution-alarm-notify/evolution-alarm-notify.c 
b/src/services/evolution-alarm-notify/evolution-alarm-notify.c
index 5467a8d7b..9a5312907 100644
--- a/src/services/evolution-alarm-notify/evolution-alarm-notify.c
+++ b/src/services/evolution-alarm-notify/evolution-alarm-notify.c
@@ -23,6 +23,7 @@
 
 #include <libedataserver/libedataserver.h>
 #include <libedataserverui/libedataserverui.h>
+#include "libedataserverui/libedataserverui-private.h"
 
 #include "e-alarm-notify.h"
 
@@ -62,12 +63,8 @@ main (gint argc,
 
        gtk_init (&argc, &argv);
 
-       if (error != NULL) {
-               g_printerr ("%s\n", error->message);
-               exit (EXIT_FAILURE);
-       }
-
        e_xml_initialize_in_main ();
+       _libedataserverui_init_icon_theme ();
 
        alarm_notify = e_alarm_notify_new (NULL, &error);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]