Added xpm parameter to dockapp_set_mask() function
authorHugo Villeneuve <hugo@hugovil.com>
Sun, 2 Jun 2013 11:53:17 +0000 (07:53 -0400)
committerHugo Villeneuve <hugo@hugovil.com>
Sun, 2 Jun 2013 11:53:17 +0000 (07:53 -0400)
src/dockapp.c

index 531fc61..6fa197c 100644 (file)
@@ -99,20 +99,20 @@ dockapp_gtk_withdrawn_hack(GtkWidget *dockwin, GtkWidget *iconwin)
 }
 
 static void
-dockapp_set_mask(GtkWidget *dockwin, GtkWidget *iconwin)
+dockapp_set_mask(GtkWidget *dockwin, GtkWidget *iconwin, char **xpm)
 {
        GdkPixbuf *pixbuf;
        GdkPixmap *pixmap;
        GdkBitmap *mask;
 
-       pixbuf = gdk_pixbuf_new_from_xpm_data((const char **)master_xpm);
+       pixbuf = gdk_pixbuf_new_from_xpm_data((const char **)xpm);
 
        gdk_pixbuf_render_pixmap_and_mask(pixbuf, &pixmap, &mask, 127);
 
        g_object_unref(pixbuf);
 
        if (!pixmap) {
-               printf("Could not load master pixmap\n");
+               printf("Could not load pixmap\n");
                exit(1);
        }
 
@@ -150,7 +150,7 @@ dockapp_init(int argc, char *argv[], char *display_arg, char *geometry_arg)
        gtk_widget_realize(iconwin);
        gdk_window_set_icon(dockwin->window, iconwin->window, NULL, NULL);
 
-       dockapp_set_mask(dockwin, iconwin);
+       dockapp_set_mask(dockwin, iconwin, master_xpm);
 
        hvclock_init(dockwin, iconwin);