Skip to content

Commit e91fe2e

Browse files
committed
Restore ABI for libfm.so
The following 2 commit: lxde@b0545e0 lxde@2854a4c broke libfm.so ABI because this changed the size of `struct _FmConfig` . Restore libfm.so ABI compared to before. Fixes lxde#104 .
1 parent 37456d7 commit e91fe2e

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

src/base/fm-config.c

+5-2
Original file line numberDiff line numberDiff line change
@@ -260,10 +260,12 @@ static void _parse_drop_default_action(GKeyFile *kf, gint *action)
260260
void fm_config_load_from_key_file(FmConfig* cfg, GKeyFile* kf)
261261
{
262262
char **strv;
263+
gboolean bool_val;
263264

264265
fm_key_file_get_bool(kf, "config", "use_trash", &cfg->use_trash);
265266
fm_key_file_get_bool(kf, "config", "single_click", &cfg->single_click);
266-
fm_key_file_get_bool(kf, "config", "middle_click", &cfg->middle_click);
267+
fm_key_file_get_bool(kf, "config", "middle_click", &bool_val);
268+
cfg->middle_click = bool_val;
267269
if(cfg->single_click && cfg->middle_click)
268270
cfg->middle_click = FALSE;
269271
fm_key_file_get_int(kf, "config", "auto_selection_delay", &cfg->auto_selection_delay);
@@ -280,7 +282,8 @@ void fm_config_load_from_key_file(FmConfig* cfg, GKeyFile* kf)
280282
fm_key_file_get_bool(kf, "config", "advanced_mode", &cfg->advanced_mode);
281283
fm_key_file_get_bool(kf, "config", "si_unit", &cfg->si_unit);
282284
fm_key_file_get_bool(kf, "config", "force_startup_notify", &cfg->force_startup_notify);
283-
fm_key_file_get_bool(kf, "config", "date_iso_8601", &cfg->date_iso_8601);
285+
fm_key_file_get_bool(kf, "config", "date_iso_8601", &bool_val);
286+
cfg->date_iso_8601 = bool_val;
284287
fm_key_file_get_bool(kf, "config", "backup_as_hidden", &cfg->backup_as_hidden);
285288
fm_key_file_get_bool(kf, "config", "no_usb_trash", &cfg->no_usb_trash);
286289
fm_key_file_get_bool(kf, "config", "no_child_non_expandable", &cfg->no_child_non_expandable);

src/base/fm-config.h

+3-5
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,6 @@ struct _FmConfig
171171
gint drop_default_action;
172172

173173
gboolean single_click;
174-
gboolean middle_click;
175174
gboolean use_trash;
176175
gboolean confirm_del;
177176
gboolean confirm_trash;
@@ -181,7 +180,6 @@ struct _FmConfig
181180
gboolean si_unit;
182181
gboolean advanced_mode;
183182
gboolean force_startup_notify;
184-
gboolean date_iso_8601;
185183
gboolean backup_as_hidden;
186184
gboolean no_usb_trash;
187185
gboolean no_child_non_expandable;
@@ -215,9 +213,9 @@ struct _FmConfig
215213
gboolean smart_desktop_autodrop;
216214
gchar *saved_search;
217215
/*< private >*/
218-
gpointer _reserved1; /* reserved space for updates until next ABI */
219-
gpointer _reserved2;
220-
gpointer _reserved3;
216+
gintptr middle_click;
217+
gintptr date_iso_8601;
218+
gpointer _reserved3; /* reserved space for updates until next ABI */
221219
gpointer _reserved4;
222220
gpointer _reserved5;
223221
gpointer _reserved6;

0 commit comments

Comments
 (0)