[Commits] [SCM] claws branch, master, updated. 3.11.1-123-g20f7a3d

mones at claws-mail.org mones at claws-mail.org
Tue Jun 9 09:44:38 CEST 2015


The branch, master has been updated
       via  20f7a3d674ea54dca8c1d5d053ae25812097090a (commit)
       via  43f6bcc91fb86aa0acfa1620dda37049c9c026f4 (commit)
      from  298a94adf85b4df86c277fa08d764a39b1706224 (commit)

Summary of changes:
 src/plugins/acpi_notifier/acpi_notifier.c         |    1 +
 src/plugins/address_keeper/address_keeper_prefs.c |    1 +
 src/plugins/attachwarner/attachwarner_prefs.c     |    1 +
 src/plugins/fetchinfo/fetchinfo_plugin_gtk.c      |    1 +
 src/plugins/gdata/cm_gdata_prefs.c                |    1 +
 src/plugins/libravatar/libravatar.c               |    2 +-
 src/plugins/libravatar/libravatar_prefs.c         |   10 ++++++----
 src/plugins/notification/notification_prefs.c     |    8 ++++++++
 8 files changed, 20 insertions(+), 5 deletions(-)


- Log -----------------------------------------------------------------
commit 20f7a3d674ea54dca8c1d5d053ae25812097090a
Author: Ricardo Mones <ricardo at mones.org>
Date:   Tue Jun 9 09:44:16 2015 +0200

    Add missing page weights on some plugins

diff --git a/src/plugins/acpi_notifier/acpi_notifier.c b/src/plugins/acpi_notifier/acpi_notifier.c
index 319f914..b25b724 100644
--- a/src/plugins/acpi_notifier/acpi_notifier.c
+++ b/src/plugins/acpi_notifier/acpi_notifier.c
@@ -800,6 +800,7 @@ void acpi_prefs_init(void)
 	acpi_prefs_page.page.create_widget = acpi_prefs_create_widget_func;
 	acpi_prefs_page.page.destroy_widget = acpi_prefs_destroy_widget_func;
 	acpi_prefs_page.page.save_page = acpi_prefs_save_func;
+	acpi_prefs_page.page.weight = 40.0;
 
 	prefs_gtk_register_page((PrefsPage *) &acpi_prefs_page);
 	folder_hook_id = hooks_register_hook (FOLDER_ITEM_UPDATE_HOOKLIST, 
diff --git a/src/plugins/address_keeper/address_keeper_prefs.c b/src/plugins/address_keeper/address_keeper_prefs.c
index 74fc19d..1b7a77c 100644
--- a/src/plugins/address_keeper/address_keeper_prefs.c
+++ b/src/plugins/address_keeper/address_keeper_prefs.c
@@ -273,6 +273,7 @@ void address_keeper_prefs_init(void)
 	addkeeperprefs_page.page.create_widget = addkeeper_prefs_create_widget_func;
 	addkeeperprefs_page.page.destroy_widget = addkeeper_prefs_destroy_widget_func;
 	addkeeperprefs_page.page.save_page = addkeeper_prefs_save_func;
+	addkeeperprefs_page.page.weight = 40.0;
 
 	prefs_gtk_register_page((PrefsPage *) &addkeeperprefs_page);
 }
diff --git a/src/plugins/attachwarner/attachwarner_prefs.c b/src/plugins/attachwarner/attachwarner_prefs.c
index e2fa395..cb144ba 100644
--- a/src/plugins/attachwarner/attachwarner_prefs.c
+++ b/src/plugins/attachwarner/attachwarner_prefs.c
@@ -247,6 +247,7 @@ void attachwarner_prefs_init(void)
 	attwarnerprefs_page.page.create_widget = attwarner_prefs_create_widget_func;
 	attwarnerprefs_page.page.destroy_widget = attwarner_prefs_destroy_widget_func;
 	attwarnerprefs_page.page.save_page = attwarner_prefs_save_func;
+	attwarnerprefs_page.page.weight = 40.0;
 
 	prefs_gtk_register_page((PrefsPage *) &attwarnerprefs_page);
 }
diff --git a/src/plugins/fetchinfo/fetchinfo_plugin_gtk.c b/src/plugins/fetchinfo/fetchinfo_plugin_gtk.c
index e82ecb2..b102732 100644
--- a/src/plugins/fetchinfo/fetchinfo_plugin_gtk.c
+++ b/src/plugins/fetchinfo/fetchinfo_plugin_gtk.c
@@ -186,6 +186,7 @@ gint fetchinfo_gtk_init(void)
 	fetchinfo_page.page.create_widget = fetchinfo_create_widget_func;
 	fetchinfo_page.page.destroy_widget = fetchinfo_destroy_widget_func;
 	fetchinfo_page.page.save_page = fetchinfo_save_func;
+	fetchinfo_page.page.weight = 40.0;
 	
 	prefs_gtk_register_page((PrefsPage *) &fetchinfo_page);
 
diff --git a/src/plugins/gdata/cm_gdata_prefs.c b/src/plugins/gdata/cm_gdata_prefs.c
index 5098a5b..a2082fd 100644
--- a/src/plugins/gdata/cm_gdata_prefs.c
+++ b/src/plugins/gdata/cm_gdata_prefs.c
@@ -150,6 +150,7 @@ void cm_gdata_prefs_init(void)
   gdata_page.page.create_widget = gdata_create_prefs_page;
   gdata_page.page.destroy_widget = gdata_destroy_prefs_page;
   gdata_page.page.save_page = gdata_save_prefs;
+  gdata_page.page.weight = 40.0;
   prefs_gtk_register_page((PrefsPage*) &gdata_page);
 }
 
diff --git a/src/plugins/libravatar/libravatar_prefs.c b/src/plugins/libravatar/libravatar_prefs.c
index f3c3be4..af6c215 100644
--- a/src/plugins/libravatar/libravatar_prefs.c
+++ b/src/plugins/libravatar/libravatar_prefs.c
@@ -457,6 +457,7 @@ void libravatar_prefs_init(void)
 	libravatarprefs_page.page.create_widget = libravatar_prefs_create_widget_func;
 	libravatarprefs_page.page.destroy_widget = libravatar_prefs_destroy_widget_func;
 	libravatarprefs_page.page.save_page = libravatar_prefs_save_func;
+	libravatarprefs_page.page.weight = 40.0;
 
 	prefs_gtk_register_page((PrefsPage *) &libravatarprefs_page);
 }
diff --git a/src/plugins/notification/notification_prefs.c b/src/plugins/notification/notification_prefs.c
index 4feac1c..ab08baf 100644
--- a/src/plugins/notification/notification_prefs.c
+++ b/src/plugins/notification/notification_prefs.c
@@ -404,6 +404,7 @@ void notify_gtk_init(void)
 	notify_page.page.create_widget = notify_create_prefs_page;
 	notify_page.page.destroy_widget = notify_destroy_prefs_page;
 	notify_page.page.save_page = notify_save_prefs;
+	notify_page.page.weight = 40.0;
 	prefs_gtk_register_page((PrefsPage*) &notify_page);
 
 #ifdef NOTIFICATION_HOTKEYS
@@ -419,6 +420,7 @@ void notify_gtk_init(void)
         hotkeys_page.page.create_widget = notify_create_hotkeys_page;
         hotkeys_page.page.destroy_widget = notify_destroy_hotkeys_page;
         hotkeys_page.page.save_page = notify_save_hotkeys;
+        hotkeys_page.page.weight = 10.0;
         prefs_gtk_register_page((PrefsPage*) &hotkeys_page);
     }
 #endif /* NOTIFICATION_HOTKEYS */
@@ -437,6 +439,7 @@ void notify_gtk_init(void)
 		banner_page.page.create_widget = notify_create_banner_page;
 		banner_page.page.destroy_widget = notify_destroy_banner_page;
 		banner_page.page.save_page = notify_save_banner;
+		banner_page.page.weight = 20.0;
 		prefs_gtk_register_page((PrefsPage*) &banner_page);
 	}
 #endif /* NOTIFICATION_BANNER */
@@ -454,6 +457,7 @@ void notify_gtk_init(void)
 		popup_page.page.create_widget = notify_create_popup_page;
 		popup_page.page.destroy_widget = notify_destroy_popup_page;
 		popup_page.page.save_page = notify_save_popup;
+		popup_page.page.weight = 30.0;
 		prefs_gtk_register_page((PrefsPage*) &popup_page);
 	}
 #endif /* NOTIFICATION_POPUP */
@@ -471,6 +475,7 @@ void notify_gtk_init(void)
 		command_page.page.create_widget = notify_create_command_page;
 		command_page.page.destroy_widget = notify_destroy_command_page;
 		command_page.page.save_page = notify_save_command;
+		command_page.page.weight = 40.0;
 		prefs_gtk_register_page((PrefsPage*) &command_page);
 	}
 #endif /* NOTIFICATION_COMMAND */
@@ -488,6 +493,7 @@ void notify_gtk_init(void)
 		lcdproc_page.page.create_widget = notify_create_lcdproc_page;
 		lcdproc_page.page.destroy_widget = notify_destroy_lcdproc_page;
 		lcdproc_page.page.save_page = notify_save_lcdproc;
+		lcdproc_page.page.weight = 50.0;
 		prefs_gtk_register_page((PrefsPage*) &lcdproc_page);
 	}
 #endif /* NOTIFICATION_LCDPROC */
@@ -505,6 +511,7 @@ void notify_gtk_init(void)
 		trayicon_page.page.create_widget = notify_create_trayicon_page;
 		trayicon_page.page.destroy_widget = notify_destroy_trayicon_page;
 		trayicon_page.page.save_page = notify_save_trayicon;
+		trayicon_page.page.weight = 60.0;
 		prefs_gtk_register_page((PrefsPage*) &trayicon_page);
 	}
 #endif /* NOTIFICATION_TRAYICON */
@@ -522,6 +529,7 @@ void notify_gtk_init(void)
 		indicator_page.page.create_widget = notify_create_indicator_page;
 		indicator_page.page.destroy_widget = notify_destroy_indicator_page;
 		indicator_page.page.save_page = notify_save_indicator;
+		indicator_page.page.weight = 70.0;
 		prefs_gtk_register_page((PrefsPage*) &indicator_page);
 	}
 #endif /* NOTIFICATION_INDICATOR */

commit 43f6bcc91fb86aa0acfa1620dda37049c9c026f4
Author: Ricardo Mones <ricardo at mones.org>
Date:   Tue Jun 9 09:43:35 2015 +0200

    Libravatar: use accessor for common preferences
    
    Fixes crash on Windows when loading preferences page.
    
    Original patch thanks to Ticho:
    http://git.claws-mail.org/?p=claws-win32-installer.git;a=commitdiff;h=956cf9f8

diff --git a/src/plugins/libravatar/libravatar.c b/src/plugins/libravatar/libravatar.c
index 3088fa2..a09e6d0 100644
--- a/src/plugins/libravatar/libravatar.c
+++ b/src/plugins/libravatar/libravatar.c
@@ -286,7 +286,7 @@ static gboolean libravatar_image_render_hook(gpointer source, gpointer data)
 			return FALSE;
 		}
 		/* not cached copy: try network */
-		if (prefs_common.work_offline) {
+		if (prefs_common_get_prefs()->work_offline) {
 			debug_print("working off-line: libravatar network retrieval skipped\n");
 			return FALSE;
 		}
diff --git a/src/plugins/libravatar/libravatar_prefs.c b/src/plugins/libravatar/libravatar_prefs.c
index 4c01545..f3c3be4 100644
--- a/src/plugins/libravatar/libravatar_prefs.c
+++ b/src/plugins/libravatar/libravatar_prefs.c
@@ -179,10 +179,10 @@ static void default_mode_radio_button_cb(GtkToggleButton *button, gpointer data)
 			TRUE);
 
 	if (mode == DEF_MODE_NONE) {
-		prefs_common.enable_avatars = AVATARS_ENABLE_BOTH;
+		prefs_common_get_prefs()->enable_avatars = AVATARS_ENABLE_BOTH;
 	} else {
 		/* don't waste time with headers that won't be displayed */
-		prefs_common.enable_avatars = AVATARS_DISABLE;
+		prefs_common_get_prefs()->enable_avatars = AVATARS_DISABLE;
 		/* empty missing cache when switching to generated */
 		g_hash_table_remove_all(libravatarmisses);
 	}
@@ -263,8 +263,9 @@ static GtkWidget *p_create_frame_missing(struct LibravatarPrefsPage *page)
 		libravatarprefs.default_mode = DEF_MODE_NONE;
 	}
 	/* don't waste time with headers that won't be displayed */
-	prefs_common.enable_avatars = (libravatarprefs.default_mode == DEF_MODE_NONE)
-						? AVATARS_ENABLE_BOTH: AVATARS_DISABLE;
+	prefs_common_get_prefs()->enable_avatars =
+		(libravatarprefs.default_mode == DEF_MODE_NONE)
+		? AVATARS_ENABLE_BOTH: AVATARS_DISABLE;
 
 
 

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail


More information about the Commits mailing list