Wireshark · Wireshark-dev: Re: [Wireshark-dev] Replacing gdk_pixmap_create_from_xpm_d in gui_utils.c

[Joerg Mayer <jmayer@xxxxxxxxx>]

On Sun, Jul 24, 2011 at 10:05:41PM +0200, Anders Broman wrote:
> Unfortunately I don't have a Linux system to try it out on at the  
> moment, so I'd appreciate if some one that has could
> try it out.

I'm not sure what to test. If it's about what icon appears in my window-
manager to represent wireshark, then yes, there is a wireshark icon
(blue, heading left).

I've attached the version of the patch that I tested (basically copy
paste the stuff in and make it compile).

ciao
  Joerg

-- 
Joerg Mayer                                           <jmayer@xxxxxxxxx>
We are stuck with technology when what we really want is just stuff that
works. Some say that should read Microsoft instead of technology.

Index: gui_utils.c
===================================================================
--- gui_utils.c	(revision 38191)
+++ gui_utils.c	(working copy)
@@ -117,13 +117,16 @@
     static GdkPixmap *icon_pmap = NULL;
     static GdkBitmap *icon_mask = NULL;
     GtkStyle         *style;
+GList *Main_Icon_List=NULL;
+GdkPixbuf *Icon;
+
 
     style = gtk_widget_get_style (win);
 
     if (icon_pmap == NULL) {
-        icon_pmap = gdk_pixmap_create_from_xpm_d (gtk_widget_get_window(win),
-                                                  &icon_mask, &style->bg[GTK_STATE_NORMAL],
-                                                  (gchar **) wsicon16_xpm);
+ Icon = gdk_pixbuf_new_from_xpm_data ((const char **) wsicon16_xpm);
+Main_Icon_List = g_list_append (Main_Icon_List, Icon);
+gtk_window_set_icon_list(GTK_WINDOW(win), Main_Icon_List);
     }
 
     gdk_window_set_icon (gtk_widget_get_window(win), NULL, icon_pmap, icon_mask);