2009-01-02 [colin] 3.7.0cvs10

[claws.git] / src / gtk / gtkutils.c

diff --git a/src/gtk/gtkutils.c b/src/gtk/gtkutils.c
index 487c82ba72a66cddc61b7d8828d90e865e044665..c9e73cdc7a1d6396c9a7979ddd5422ac6cfae682 100644 (file)
--- a/src/gtk/gtkutils.c
+++ b/src/gtk/gtkutils.c
@@ -710,30 +710,28 @@ void gtkut_widget_init(void)
 
 void gtkut_widget_set_app_icon(GtkWidget *widget)
 {
-#include "pixmaps/claws-mail.xpm"
-       static GdkPixmap *sylpheedclawsxpm;
-       static GdkBitmap *sylpheedclawsxpmmask;
+       static GdkPixbuf *icon = NULL;
        
        g_return_if_fail(widget != NULL);
        g_return_if_fail(widget->window != NULL);
-       if (!sylpheedclawsxpm) {
-               PIXMAP_CREATE(widget, sylpheedclawsxpm, sylpheedclawsxpmmask,
-                             claws_mail_xpm);
+       if (!icon) {
+               stock_pixbuf_gdk(widget, STOCK_PIXMAP_CLAWS_MAIL_ICON, &icon);
        }               
-       gdk_window_set_icon(widget->window, NULL, sylpheedclawsxpm, sylpheedclawsxpmmask);
+       if (icon)
+               gtk_window_set_icon(GTK_WINDOW(widget), icon);
 }
 
 void gtkut_widget_set_composer_icon(GtkWidget *widget)
 {
-       static GdkPixmap *xpm;
-       static GdkBitmap *bmp;
-
+       static GdkPixbuf *icon = NULL;
+       
        g_return_if_fail(widget != NULL);
        g_return_if_fail(widget->window != NULL);
-       if (!xpm) {
-               stock_pixmap_gdk(widget, STOCK_PIXMAP_MAIL_COMPOSE, &xpm, &bmp);
-       }
-       gdk_window_set_icon(widget->window, NULL, xpm, bmp);    
+       if (!icon) {
+               stock_pixbuf_gdk(widget, STOCK_PIXMAP_MAIL_COMPOSE, &icon);
+       }               
+       if (icon)
+               gtk_window_set_icon(GTK_WINDOW(widget), icon);
 }
 
 static gboolean move_bar = FALSE;
@@ -1662,7 +1660,8 @@ gint
 claws_input_add    (gint             source,
                    GdkInputCondition condition,
                    GdkInputFunction  function,
-                   gpointer          data)
+                   gpointer          data,
+                   gboolean          is_sock)
 {
   guint result;
   ClawsIOClosure *closure = g_new (ClawsIOClosure, 1);
@@ -1684,7 +1683,10 @@ claws_input_add    (gint       source,
 #ifndef G_OS_WIN32
   channel = g_io_channel_unix_new (source);
 #else
-  channel = g_io_channel_win32_new_fd(source);
+  if (is_sock)
+    channel = g_io_channel_win32_new_socket(source);
+  else
+    channel = g_io_channel_win32_new_fd(source);
 #endif
   result = g_io_add_watch_full (channel, G_PRIORITY_DEFAULT, cond, 
                                claws_io_invoke,