gdk_pixbuf_render_pixmap_and_mask_for_colormap() used in xpm_to_widget_from_parent...

Rather tan trying to replace it go for the simpler xpm_to_widget() The
result looks the same to me.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38549 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/gtk/about_dlg.c b/gtk/about_dlg.c
index 012f3dad0a8548872a20a0481e68e5dfa7bf2902..c95942f6e0e47b0760eb15088a023a4fed6c753c 100644 (file)
--- a/gtk/about_dlg.c
+++ b/gtk/about_dlg.c
@@ -79,7 +79,9 @@ about_wireshark(GtkWidget *parent, GtkWidget *main_vb)
   gchar       *message;
   const char  *title = "Network Protocol Analyzer";
 
-  icon = xpm_to_widget_from_parent(parent, wssplash_xpm);
+  /*icon = xpm_to_widget_from_parent(parent, wssplash_xpm);*/
+  icon = xpm_to_widget(wssplash_xpm);
+
   gtk_container_add(GTK_CONTAINER(main_vb), icon);
 
   msg_label = gtk_label_new(title);

diff --git a/gtk/gui_utils.c b/gtk/gui_utils.c
index 6531f0cdc65796750597095524c1e875a686757b..6fcdcbe588c7bd819ae0b562c36a08e8da20aa46 100644 (file)
--- a/gtk/gui_utils.c
+++ b/gtk/gui_utils.c
@@ -541,7 +541,8 @@ window_destroy(GtkWidget *win)
     gtk_widget_destroy(win);
 }
 
-
+#if 0
+/* Do we need this one ? */
 /* convert an xpm to a GtkWidget, using the window settings from it's parent */
 /* (be sure that the parent window is already being displayed) */
 GtkWidget *xpm_to_widget_from_parent(GtkWidget *parent, const char ** xpm) {
@@ -555,7 +556,7 @@ GtkWidget *xpm_to_widget_from_parent(GtkWidget *parent, const char ** xpm) {
 
     return gtk_image_new_from_pixmap (pixmap, bitmap);
 }
-
+#endif
 
 /* convert an xpm to a GtkWidget */
 GtkWidget *xpm_to_widget(const char ** xpm) {

diff --git a/gtk/gui_utils.h b/gtk/gui_utils.h
index ffe6cf419752930bde2e66b944364a6dfff15f7c..9720a2a0d6dc95260ec9683564d63b3fa51f6266 100644 (file)
--- a/gtk/gui_utils.h
+++ b/gtk/gui_utils.h
@@ -295,7 +295,7 @@ extern GtkWidget *xpm_to_widget(const char ** xpm);
  * @param xpm the character array containing the picture
  * @return a newly created GtkWidget showing the picture
  */
-extern GtkWidget *xpm_to_widget_from_parent(GtkWidget *parent, const char ** xpm);
+/*extern GtkWidget *xpm_to_widget_from_parent(GtkWidget *parent, const char ** xpm);*/
 
 /** Convert an pixbuf data to a GtkWidget
  *

diff --git a/gtk/main_welcome.c b/gtk/main_welcome.c
index 68dfc9eb1939aced134d76acfe74e4db2fac3eb8..db77ff33204140d53a95123000ebe2a8269e6b36 100644 (file)
--- a/gtk/main_welcome.c
+++ b/gtk/main_welcome.c
@@ -332,7 +332,8 @@ welcome_header_new(void)
     item_hb = gtk_hbox_new(FALSE, 0);
     gtk_box_pack_start(GTK_BOX(item_vb), item_hb, FALSE, FALSE, 10);
 
-    icon = xpm_to_widget_from_parent(top_level, wssplash_xpm);
+    /*icon = xpm_to_widget_from_parent(top_level, wssplash_xpm);*/
+       icon = xpm_to_widget(wssplash_xpm);
     gtk_box_pack_start(GTK_BOX(item_hb), icon, FALSE, FALSE, 10);
 
     header_lb = gtk_label_new(NULL);