[balsa/gtk3] GtkAssistant deprecation cleanup

[Peter Bloomfield <PeterB src gnome org>]

commit ca06812cf24cd57976fd3ada13132e2cabf1f8a2
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Fri Oct 14 10:27:13 2011 -0400

    GtkAssistant deprecation cleanup
    
    	gtk_assistant_set_page_header_image and
    	gtk_assistant_set_page_side_image are deprecated.
    
    	* images/Makefile.am: no need for balsa-logo.png and
    	balsa-watermark.png.
    	* libinit_balsa/assistant_init.c (balsa_initdruid):
    	* libinit_balsa/assistant_page_defclient.c
    	(balsa_druid_page_defclient):
    	* libinit_balsa/assistant_page_defclient.h:
    	* libinit_balsa/assistant_page_directory.c
    	(balsa_druid_page_directory):
    	* libinit_balsa/assistant_page_directory.h:
    	* libinit_balsa/assistant_page_finish.c (balsa_druid_page_finish):
    	* libinit_balsa/assistant_page_finish.h:
    	* libinit_balsa/assistant_page_user.c (balsa_druid_page_user):
    	* libinit_balsa/assistant_page_user.h:
    	* libinit_balsa/assistant_page_welcome.c
    	(balsa_druid_page_welcome):
    	* libinit_balsa/assistant_page_welcome.h: deprecation cleanup.

 ChangeLog                                |   22 ++++++++++++++++++++++
 images/Makefile.am                       |    2 --
 libinit_balsa/assistant_init.c           |   12 +++++-------
 libinit_balsa/assistant_page_defclient.c |    5 ++---
 libinit_balsa/assistant_page_defclient.h |    3 +--
 libinit_balsa/assistant_page_directory.c |    5 ++---
 libinit_balsa/assistant_page_directory.h |    3 +--
 libinit_balsa/assistant_page_finish.c    |    3 +--
 libinit_balsa/assistant_page_finish.h    |    3 +--
 libinit_balsa/assistant_page_user.c      |    5 ++---
 libinit_balsa/assistant_page_user.h      |    3 +--
 libinit_balsa/assistant_page_welcome.c   |    5 +----
 libinit_balsa/assistant_page_welcome.h   |    3 +--
 13 files changed, 40 insertions(+), 34 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 2315c24..41bd554 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,27 @@
 2011-10-14  Peter Bloomfield
 
+	gtk_assistant_set_page_header_image and
+	gtk_assistant_set_page_side_image are deprecated.
+
+	* images/Makefile.am: no need for balsa-logo.png and
+	balsa-watermark.png.
+	* libinit_balsa/assistant_init.c (balsa_initdruid):
+	* libinit_balsa/assistant_page_defclient.c
+	(balsa_druid_page_defclient):
+	* libinit_balsa/assistant_page_defclient.h:
+	* libinit_balsa/assistant_page_directory.c
+	(balsa_druid_page_directory):
+	* libinit_balsa/assistant_page_directory.h:
+	* libinit_balsa/assistant_page_finish.c (balsa_druid_page_finish):
+	* libinit_balsa/assistant_page_finish.h:
+	* libinit_balsa/assistant_page_user.c (balsa_druid_page_user):
+	* libinit_balsa/assistant_page_user.h:
+	* libinit_balsa/assistant_page_welcome.c
+	(balsa_druid_page_welcome):
+	* libinit_balsa/assistant_page_welcome.h: deprecation cleanup.
+
+2011-10-14  Peter Bloomfield
+
 	Gtk{HV}Paned is deprecated.
 
 	* src/main-window.c: deprecation cleanup.
diff --git a/images/Makefile.am b/images/Makefile.am
index 80fb72d..98a7b94 100644
--- a/images/Makefile.am
+++ b/images/Makefile.am
@@ -8,9 +8,7 @@ endif
 # balsa-logo.png used by the init-druid
 balsa_IMGS = \
 	attachment.png		\
-	balsa-logo.png		\
 	balsa-top.png		\
-	balsa-watermark.png	\
 	balsa_icon.png		\
 	balsa_logo.png
 
diff --git a/libinit_balsa/assistant_init.c b/libinit_balsa/assistant_init.c
index b0ab6d2..21c1f59 100644
--- a/libinit_balsa/assistant_init.c
+++ b/libinit_balsa/assistant_init.c
@@ -109,8 +109,6 @@ balsa_initdruid_apply(GtkAssistant * druid)
 void
 balsa_initdruid(GtkAssistant * assistant)
 {
-    GdkPixbuf *default_logo = balsa_init_get_png("balsa-logo.png");
-
     g_return_if_fail(assistant != NULL);
     g_return_if_fail(GTK_IS_ASSISTANT(assistant));
 
@@ -119,15 +117,15 @@ balsa_initdruid(GtkAssistant * assistant)
     g_signal_connect(G_OBJECT(assistant), "close",
                      G_CALLBACK(balsa_initdruid_apply), NULL);
 
-    balsa_druid_page_welcome(assistant, default_logo);
-    balsa_druid_page_user(assistant, default_logo);
+    balsa_druid_page_welcome(assistant);
+    balsa_druid_page_user(assistant);
 #if !defined(ENABLE_TOUCH_UI)
-    balsa_druid_page_directory(assistant, default_logo);
+    balsa_druid_page_directory(assistant);
 #if HAVE_GNOME
-    balsa_druid_page_defclient(assistant, default_logo);
+    balsa_druid_page_defclient(assistant);
 #endif
 #endif
-    balsa_druid_page_finish(assistant, default_logo);
+    balsa_druid_page_finish(assistant);
 }
 
 
diff --git a/libinit_balsa/assistant_page_defclient.c b/libinit_balsa/assistant_page_defclient.c
index b2a1a60..e42f0b3 100644
--- a/libinit_balsa/assistant_page_defclient.c
+++ b/libinit_balsa/assistant_page_defclient.c
@@ -77,7 +77,7 @@ balsa_druid_page_defclient_init(BalsaDruidPageDefclient * defclient,
 }
 
 void
-balsa_druid_page_defclient(GtkAssistant *druid, GdkPixbuf *default_logo)
+balsa_druid_page_defclient(GtkAssistant *druid)
 {
     GAppInfo *info;
     BalsaDruidPageDefclient *defclient;
@@ -95,10 +95,9 @@ balsa_druid_page_defclient(GtkAssistant *druid, GdkPixbuf *default_logo)
     }
 
     defclient = g_new0(BalsaDruidPageDefclient, 1);
-    page = gtk_box_new(GTK_ORIENTATION_VERTICAL, FALSE);
+    page = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
     gtk_assistant_append_page(druid, page);
     gtk_assistant_set_page_title(druid, page, _("Default Client"));
-    gtk_assistant_set_page_header_image(druid, page, default_logo);
     balsa_druid_page_defclient_init(defclient, page, druid);
     /* This one is ready to pass through. */
     gtk_assistant_set_page_complete(druid, page, TRUE);
diff --git a/libinit_balsa/assistant_page_defclient.h b/libinit_balsa/assistant_page_defclient.h
index c605e9c..b0280a3 100644
--- a/libinit_balsa/assistant_page_defclient.h
+++ b/libinit_balsa/assistant_page_defclient.h
@@ -54,8 +54,7 @@ extern "C" {
 /*
  * Public methods
  */
-    void balsa_druid_page_defclient(GtkAssistant * druid, 
-                                    GdkPixbuf * default_logo);
+    void balsa_druid_page_defclient(GtkAssistant * druid);
     void balsa_druid_page_defclient_save(BalsaDruidPageDefclient * defclient);
 
 #endif /* HAVE_GNOME */
diff --git a/libinit_balsa/assistant_page_directory.c b/libinit_balsa/assistant_page_directory.c
index ed13ccb..6f9b060 100644
--- a/libinit_balsa/assistant_page_directory.c
+++ b/libinit_balsa/assistant_page_directory.c
@@ -258,15 +258,14 @@ balsa_druid_page_directory_init(BalsaDruidPageDirectory * dir,
 
 
 void
-balsa_druid_page_directory(GtkAssistant * druid, GdkPixbuf * default_logo)
+balsa_druid_page_directory(GtkAssistant * druid)
 {
     BalsaDruidPageDirectory *dir;
 
     dir = g_new0(BalsaDruidPageDirectory, 1);
-    dir->page = gtk_box_new(GTK_ORIENTATION_VERTICAL, FALSE);
+    dir->page = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
     gtk_assistant_append_page(druid, dir->page);
     gtk_assistant_set_page_title(druid, dir->page, _("Mail Files"));
-    gtk_assistant_set_page_header_image(druid, dir->page, default_logo);
     balsa_druid_page_directory_init(dir, dir->page, druid);
     g_object_weak_ref(G_OBJECT(druid), (GWeakNotify)g_free, dir);
 }
diff --git a/libinit_balsa/assistant_page_directory.h b/libinit_balsa/assistant_page_directory.h
index 3241b48..84666dc 100644
--- a/libinit_balsa/assistant_page_directory.h
+++ b/libinit_balsa/assistant_page_directory.h
@@ -65,8 +65,7 @@ extern "C" {
 /*
  * Public methods
  */
-    void balsa_druid_page_directory(GtkAssistant * druid,
-                                    GdkPixbuf * default_logo);
+    void balsa_druid_page_directory(GtkAssistant * druid);
     void balsa_druid_page_directory_later(GtkWidget *druid);
 
 
diff --git a/libinit_balsa/assistant_page_finish.c b/libinit_balsa/assistant_page_finish.c
index 0e9daf2..d60cfd2 100644
--- a/libinit_balsa/assistant_page_finish.c
+++ b/libinit_balsa/assistant_page_finish.c
@@ -38,7 +38,7 @@ static void balsa_druid_page_finish_finish(GtkWidget * page,
 #endif
 
 void
-balsa_druid_page_finish(GtkAssistant * druid, GdkPixbuf * default_logo)
+balsa_druid_page_finish(GtkAssistant * druid)
 {
     static const gchar bye[] =
         N_("You've successfully set up Balsa. Have fun!\n"
@@ -47,7 +47,6 @@ balsa_druid_page_finish(GtkAssistant * druid, GdkPixbuf * default_logo)
 
     gtk_assistant_append_page(druid, page);
     gtk_assistant_set_page_title(druid, page, _("All Done!"));
-    gtk_assistant_set_page_header_image(druid, page, default_logo);
     gtk_assistant_set_page_type(druid, page, GTK_ASSISTANT_PAGE_SUMMARY);
 }
 
diff --git a/libinit_balsa/assistant_page_finish.h b/libinit_balsa/assistant_page_finish.h
index 6a1e2f9..1e79432 100644
--- a/libinit_balsa/assistant_page_finish.h
+++ b/libinit_balsa/assistant_page_finish.h
@@ -35,8 +35,7 @@ extern "C" {
 /*
  * Public methods
  */
-    void balsa_druid_page_finish(GtkAssistant * druid,
-                                 GdkPixbuf * default_logo);
+    void balsa_druid_page_finish(GtkAssistant * druid);
 
 #ifdef __cplusplus
 }
diff --git a/libinit_balsa/assistant_page_user.c b/libinit_balsa/assistant_page_user.c
index e7bda2a..4e13375 100644
--- a/libinit_balsa/assistant_page_user.c
+++ b/libinit_balsa/assistant_page_user.c
@@ -165,15 +165,14 @@ balsa_druid_page_user_init(BalsaDruidPageUser * user,
 }
 
 void
-balsa_druid_page_user(GtkAssistant * druid, GdkPixbuf * default_logo)
+balsa_druid_page_user(GtkAssistant * druid)
 {
     BalsaDruidPageUser *user;
 
     user = g_new0(BalsaDruidPageUser, 1);
-    user->page = gtk_box_new(GTK_ORIENTATION_VERTICAL, FALSE);
+    user->page = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
     gtk_assistant_append_page(druid, user->page);
     gtk_assistant_set_page_title(druid, user->page, _("User Settings"));
-    gtk_assistant_set_page_header_image(druid, user->page, default_logo);
     balsa_druid_page_user_init(user, user->page, druid);
 
     g_signal_connect(G_OBJECT(druid), "prepare",
diff --git a/libinit_balsa/assistant_page_user.h b/libinit_balsa/assistant_page_user.h
index 05273e7..f2225cb 100644
--- a/libinit_balsa/assistant_page_user.h
+++ b/libinit_balsa/assistant_page_user.h
@@ -69,8 +69,7 @@ extern "C" {
 /*
  * Public methods
  */
-    void balsa_druid_page_user(GtkAssistant * druid, 
-                               GdkPixbuf * default_logo);
+    void balsa_druid_page_user(GtkAssistant * druid);
 
 #ifdef __cplusplus
 }
diff --git a/libinit_balsa/assistant_page_welcome.c b/libinit_balsa/assistant_page_welcome.c
index e52f918..fae0d69 100644
--- a/libinit_balsa/assistant_page_welcome.c
+++ b/libinit_balsa/assistant_page_welcome.c
@@ -23,7 +23,7 @@
 #include <glib/gi18n.h>
 
 void
-balsa_druid_page_welcome(GtkAssistant * druid, GdkPixbuf * default_logo)
+balsa_druid_page_welcome(GtkAssistant * druid)
 {
     GtkWidget *page;
     static const gchar title[] = N_("Welcome to Balsa!");
@@ -43,9 +43,6 @@ balsa_druid_page_welcome(GtkAssistant * druid, GdkPixbuf * default_logo)
     
     gtk_assistant_append_page(druid, page);
     gtk_assistant_set_page_title(druid, page, _(title));
-    gtk_assistant_set_page_header_image(druid, page, default_logo);
-    gtk_assistant_set_page_side_image(druid, page,
-                                      balsa_init_get_png("balsa-watermark.png"));
     gtk_assistant_set_page_type(druid, page, GTK_ASSISTANT_PAGE_INTRO);
     gtk_assistant_set_page_complete(druid, page, TRUE);
 }
diff --git a/libinit_balsa/assistant_page_welcome.h b/libinit_balsa/assistant_page_welcome.h
index bcfcc15..9f37f6f 100644
--- a/libinit_balsa/assistant_page_welcome.h
+++ b/libinit_balsa/assistant_page_welcome.h
@@ -33,8 +33,7 @@ extern "C" {
 /*
  * Public methods
  */
-    void balsa_druid_page_welcome(GtkAssistant * druid,
-                                  GdkPixbuf * default_logo);
+    void balsa_druid_page_welcome(GtkAssistant * druid);
 
 #ifdef __cplusplus
 }