Fix bug #3020, "Use theme doesn't change some icons until restart"

diff --git a/src/addr_compl.c b/src/addr_compl.c
index ed73557880f382e2c0dad838754704a7c4074b0a..7472fc1addd9f4c1147efd6c145b2eef8c9d8cf4 100644 (file)
--- a/src/addr_compl.c
+++ b/src/addr_compl.c
@@ -969,6 +969,17 @@ static void addrcompl_add_entry( CompletionWindow *cw, gchar *address ) {
 #endif
 }
 
 #endif
 }
 

+void addrcompl_reflect_prefs_pixmap_theme(void) {
+       if (group_pixbuf) {
+               g_object_unref(G_OBJECT(group_pixbuf));
+               group_pixbuf = NULL;
+       }
+       if (email_pixbuf) {
+               g_object_unref(G_OBJECT(email_pixbuf));
+               email_pixbuf = NULL;
+       }
+}
+

 /**
  * Completion idle function. This function is called by the main (UI) thread
  * during UI idle time while an address search is in progress. Items from the
 /**
  * Completion idle function. This function is called by the main (UI) thread
  * during UI idle time while an address search is in progress. Items from the

diff --git a/src/addr_compl.h b/src/addr_compl.h
index 3dbdc8ddbac69fe7b2e4721f01b3660f81d0ec96..de9d4b1b5a3d8fcfbf762b6de8ce47726d710d90 100644 (file)
--- a/src/addr_compl.h
+++ b/src/addr_compl.h
@@ -54,4 +54,5 @@ void addrcompl_teardown               ( void );
 
 void addr_compl_add_address1(const char *str, address_entry *ae);
 
 
 void addr_compl_add_address1(const char *str, address_entry *ae);
 

+void addrcompl_reflect_prefs_pixmap_theme(void);

 #endif /* __ADDR_COMPL_H__ */
 #endif /* __ADDR_COMPL_H__ */

diff --git a/src/prefs_themes.c b/src/prefs_themes.c
index 2f3202c1702b033cd94b135f69310d0c8c977f94..6c69fba9d56271a369fc9aa6a67e519b373934e4 100644 (file)
--- a/src/prefs_themes.c
+++ b/src/prefs_themes.c
@@ -428,14 +428,15 @@ static void prefs_themes_btn_use_clicked_cb(GtkWidget *widget, gpointer data)
        gchar      *theme_str;
 
        theme_str = tdata->displayed;
        gchar      *theme_str;
 
        theme_str = tdata->displayed;

-       
+

        g_free(prefs_common.pixmap_theme_path);
        g_free(prefs_common.pixmap_theme_path);

-       
+

         prefs_common.pixmap_theme_path = g_strdup(theme_str);
         prefs_common.pixmap_theme_path = g_strdup(theme_str);

-       
+

         main_window_reflect_prefs_all_real(TRUE);
         compose_reflect_prefs_pixmap_theme();
         main_window_reflect_prefs_all_real(TRUE);
         compose_reflect_prefs_pixmap_theme();

-       
+       addrcompl_reflect_prefs_pixmap_theme();
+

        prefs_themes_update_buttons(tdata);
 }
 
        prefs_themes_update_buttons(tdata);
 }