+2002-02-16 [carsten] 0.7.1claws7
+ * src/mainwindow.[ch]
+ src/summaryview.c
+ src/prefs_common.c
+ fixes for pixmap theming code:
+ - recently changed mail attributes shouldn't get
+ lost any longer
+ - theme is only reloaded iff another theme was
+ selected
+
2002-02-16 [paul] 0.7.1claws6
* sync with sylpheed 0.7.2 release
MICRO_VERSION=1
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=claws6
+EXTRA_VERSION=claws7
VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
dnl set $target
}
void main_window_reflect_prefs_all(void)
+{
+ main_window_reflect_prefs_all_real(FALSE);
+}
+
+void main_window_reflect_prefs_all_real(gboolean pixmap_theme_changed)
{
GList *cur;
MainWindow *mainwin;
main_window_set_toolbar_sensitive(mainwin);
/* pixmap themes */
- gtk_container_remove(GTK_CONTAINER(mainwin->handlebox), GTK_WIDGET(mainwin->toolbar));
- mainwin->toolbar = NULL;
- main_window_toolbar_create(mainwin, mainwin->handlebox);
- set_toolbar_style(mainwin);
- activate_compose_button(mainwin, prefs_common.toolbar_style, mainwin->compose_btn_type);
- folderview_reflect_prefs_pixmap_theme(mainwin->folderview);
- summary_reflect_prefs_pixmap_theme(mainwin->summaryview);
-
+ if (pixmap_theme_changed)
+ {
+ gtk_container_remove(GTK_CONTAINER(mainwin->handlebox), GTK_WIDGET(mainwin->toolbar));
+ mainwin->toolbar = NULL;
+ main_window_toolbar_create(mainwin, mainwin->handlebox);
+ set_toolbar_style(mainwin);
+ activate_compose_button(mainwin, prefs_common.toolbar_style, mainwin->compose_btn_type);
+ folderview_reflect_prefs_pixmap_theme(mainwin->folderview);
+ summary_reflect_prefs_pixmap_theme(mainwin->summaryview);
+ }
+
summary_redisplay_msg(mainwin->summaryview);
headerview_set_visibility(mainwin->messageview->headerview,
prefs_common.display_header_pane);
void main_window_lock (MainWindow *mainwin);
void main_window_unlock (MainWindow *mainwin);
-void main_window_reflect_prefs_all (void);
+void main_window_reflect_prefs_all_real (gboolean pixmap_theme_changed);
+void main_window_reflect_prefs_all (void);
void main_window_set_summary_column (void);
void main_window_set_account_menu (GList *account_list);
void main_window_separation_change (MainWindow *mainwin,
static void prefs_common_apply(void)
{
+ gchar *entry_pixmap_theme_str;
+ gboolean update_pixmap_theme;
+
+ entry_pixmap_theme_str = gtk_entry_get_text(GTK_ENTRY(interface.entry_pixmap_theme));
+ if (entry_pixmap_theme_str &&
+ (strcmp(prefs_common.pixmap_theme_path, entry_pixmap_theme_str) != 0) )
+ update_pixmap_theme = TRUE;
+ else
+ update_pixmap_theme = FALSE;
+
prefs_set_data_from_dialog(param);
- main_window_reflect_prefs_all();
- compose_reflect_prefs_pixmap_theme();
+
+ if (update_pixmap_theme)
+ {
+ main_window_reflect_prefs_all_real(TRUE);
+ compose_reflect_prefs_pixmap_theme();
+ } else
+ main_window_reflect_prefs_all_real(FALSE);
+
prefs_common_save_config();
inc_autocheck_timer_remove();
gtk_widget_show(pixmap);
summaryview->folder_pixmap = pixmap;
+ summary_write_cache(summaryview);
+
folderview_unselect(summaryview->folderview);
folderview_select(summaryview->folderview, summaryview->folder_item);
}