head 1.2; access; symbols pkgsrc-2023Q2:1.1.0.102 pkgsrc-2023Q2-base:1.1 pkgsrc-2023Q1:1.1.0.100 pkgsrc-2023Q1-base:1.1 pkgsrc-2022Q4:1.1.0.98 pkgsrc-2022Q4-base:1.1 pkgsrc-2022Q3:1.1.0.96 pkgsrc-2022Q3-base:1.1 pkgsrc-2022Q2:1.1.0.94 pkgsrc-2022Q2-base:1.1 pkgsrc-2022Q1:1.1.0.92 pkgsrc-2022Q1-base:1.1 pkgsrc-2021Q4:1.1.0.90 pkgsrc-2021Q4-base:1.1 pkgsrc-2021Q3:1.1.0.88 pkgsrc-2021Q3-base:1.1 pkgsrc-2021Q2:1.1.0.86 pkgsrc-2021Q2-base:1.1 pkgsrc-2021Q1:1.1.0.84 pkgsrc-2021Q1-base:1.1 pkgsrc-2020Q4:1.1.0.82 pkgsrc-2020Q4-base:1.1 pkgsrc-2020Q3:1.1.0.80 pkgsrc-2020Q3-base:1.1 pkgsrc-2020Q2:1.1.0.76 pkgsrc-2020Q2-base:1.1 pkgsrc-2020Q1:1.1.0.56 pkgsrc-2020Q1-base:1.1 pkgsrc-2019Q4:1.1.0.78 pkgsrc-2019Q4-base:1.1 pkgsrc-2019Q3:1.1.0.74 pkgsrc-2019Q3-base:1.1 pkgsrc-2019Q2:1.1.0.72 pkgsrc-2019Q2-base:1.1 pkgsrc-2019Q1:1.1.0.70 pkgsrc-2019Q1-base:1.1 pkgsrc-2018Q4:1.1.0.68 pkgsrc-2018Q4-base:1.1 pkgsrc-2018Q3:1.1.0.66 pkgsrc-2018Q3-base:1.1 pkgsrc-2018Q2:1.1.0.64 pkgsrc-2018Q2-base:1.1 pkgsrc-2018Q1:1.1.0.62 pkgsrc-2018Q1-base:1.1 pkgsrc-2017Q4:1.1.0.60 pkgsrc-2017Q4-base:1.1 pkgsrc-2017Q3:1.1.0.58 pkgsrc-2017Q3-base:1.1 pkgsrc-2017Q2:1.1.0.54 pkgsrc-2017Q2-base:1.1 pkgsrc-2017Q1:1.1.0.52 pkgsrc-2017Q1-base:1.1 pkgsrc-2016Q4:1.1.0.50 pkgsrc-2016Q4-base:1.1 pkgsrc-2016Q3:1.1.0.48 pkgsrc-2016Q3-base:1.1 pkgsrc-2016Q2:1.1.0.46 pkgsrc-2016Q2-base:1.1 pkgsrc-2016Q1:1.1.0.44 pkgsrc-2016Q1-base:1.1 pkgsrc-2015Q4:1.1.0.42 pkgsrc-2015Q4-base:1.1 pkgsrc-2015Q3:1.1.0.40 pkgsrc-2015Q3-base:1.1 pkgsrc-2015Q2:1.1.0.38 pkgsrc-2015Q2-base:1.1 pkgsrc-2015Q1:1.1.0.36 pkgsrc-2015Q1-base:1.1 pkgsrc-2014Q4:1.1.0.34 pkgsrc-2014Q4-base:1.1 pkgsrc-2014Q3:1.1.0.32 pkgsrc-2014Q3-base:1.1 pkgsrc-2014Q2:1.1.0.30 pkgsrc-2014Q2-base:1.1 pkgsrc-2014Q1:1.1.0.28 pkgsrc-2014Q1-base:1.1 pkgsrc-2013Q4:1.1.0.26 pkgsrc-2013Q4-base:1.1 pkgsrc-2013Q3:1.1.0.24 pkgsrc-2013Q3-base:1.1 pkgsrc-2013Q2:1.1.0.22 pkgsrc-2013Q2-base:1.1 pkgsrc-2013Q1:1.1.0.20 pkgsrc-2013Q1-base:1.1 pkgsrc-2012Q4:1.1.0.18 pkgsrc-2012Q4-base:1.1 pkgsrc-2012Q3:1.1.0.16 pkgsrc-2012Q3-base:1.1 pkgsrc-2012Q2:1.1.0.14 pkgsrc-2012Q2-base:1.1 pkgsrc-2012Q1:1.1.0.12 pkgsrc-2012Q1-base:1.1 pkgsrc-2011Q4:1.1.0.10 pkgsrc-2011Q4-base:1.1 pkgsrc-2011Q3:1.1.0.8 pkgsrc-2011Q3-base:1.1 pkgsrc-2011Q2:1.1.0.6 pkgsrc-2011Q2-base:1.1 pkgsrc-2011Q1:1.1.0.4 pkgsrc-2011Q1-base:1.1 pkgsrc-2010Q4:1.1.0.2 pkgsrc-2010Q4-base:1.1; locks; strict; comment @# @; 1.2 date 2023.07.19.06.58.04; author wiz; state dead; branches; next 1.1; commitid 8xTQjdJYbVn9GnxE; 1.1 date 2010.12.04.21.15.00; author adam; state Exp; branches; next ; desc @@ 1.2 log @gthumb: update to 3.12.2. More than 10 years of development. Add patch to fix build with exiv2 0.28. @ text @$NetBSD: patch-ag,v 1.1 2010/12/04 21:15:00 adam Exp $ Updated from http://git.gnome.org/browse/libegg/tree/libegg/smclient --- copy-n-paste/eggsmclient.c.orig 2010-07-15 18:45:38.000000000 +0000 +++ copy-n-paste/eggsmclient.c @@@@ -202,7 +202,8 @@@@ sm_client_post_parse_func (GOptionContex * use the same client id. */ g_unsetenv ("DESKTOP_AUTOSTART_ID"); - if (EGG_SM_CLIENT_GET_CLASS (client)->startup) + if (global_client_mode != EGG_SM_CLIENT_MODE_DISABLED && + EGG_SM_CLIENT_GET_CLASS (client)->startup) EGG_SM_CLIENT_GET_CLASS (client)->startup (client, sm_client_id); return TRUE; } @@@@ -265,9 +266,9 @@@@ egg_sm_client_get_option_group (void) * Sets the "mode" of #EggSMClient as follows: * * %EGG_SM_CLIENT_MODE_DISABLED: Session management is completely - * disabled. The application will not even connect to the session - * manager. (egg_sm_client_get() will still return an #EggSMClient, - * but it will just be a dummy object.) + * disabled, until the mode is changed again. The application will + * not even connect to the session manager. (egg_sm_client_get() + * will still return an #EggSMClient object.) * * %EGG_SM_CLIENT_MODE_NO_RESTART: The application will connect to * the session manager (and thus will receive notification when the @@@@ -277,12 +278,27 @@@@ egg_sm_client_get_option_group (void) * %EGG_SM_CLIENT_MODE_NORMAL: The default. #EggSMCLient will * function normally. * - * This must be called before the application's main loop begins. + * This must be called before the application's main loop begins and + * before any call to egg_sm_client_get(), unless the mode was set + * earlier to %EGG_SM_CLIENT_MODE_DISABLED and this call enables + * session management. Note that option parsing will call + * egg_sm_client_get(). **/ void egg_sm_client_set_mode (EggSMClientMode mode) { + EggSMClientMode old_mode = global_client_mode; + + g_return_if_fail (global_client == NULL || global_client_mode == EGG_SM_CLIENT_MODE_DISABLED); + g_return_if_fail (!(global_client != NULL && mode == EGG_SM_CLIENT_MODE_DISABLED)); + global_client_mode = mode; + + if (global_client != NULL && old_mode == EGG_SM_CLIENT_MODE_DISABLED) + { + if (EGG_SM_CLIENT_GET_CLASS (global_client)->startup) + EGG_SM_CLIENT_GET_CLASS (global_client)->startup (global_client, sm_client_id); + } } /** @@@@ -317,8 +333,7 @@@@ egg_sm_client_get (void) { if (!global_client) { - if (global_client_mode != EGG_SM_CLIENT_MODE_DISABLED && - !sm_client_disable) + if (!sm_client_disable) { #if defined (GDK_WINDOWING_WIN32) global_client = egg_sm_client_win32_new (); @ 1.1 log @* Fix building on Mac OS X * Fix building with Exiv2 0.21 @ text @d1 1 a1 1 $NetBSD$ @