Sophie

Sophie

distrib > Mandriva > current > i586 > media > contrib-release-src > by-pkgid > 9ec37d859a7713de62bd171a0fde787a > files > 1

lxlauncher-0.2.1-3mdv2010.1.src.rpm

diff -p -up lxlauncher-0.2/src/lxlauncher.c.background lxlauncher-0.2/src/lxlauncher.c
--- lxlauncher-0.2/src/lxlauncher.c.background	2008-09-29 20:40:35.000000000 +0200
+++ lxlauncher-0.2/src/lxlauncher.c	2008-10-02 21:57:23.000000000 +0200
@@ -220,6 +220,7 @@ static gboolean on_viewport_expose( GtkW
 
     if( GTK_WIDGET_DRAWABLE(w) && evt->window == ((GtkViewport*)w)->bin_window )
     {
+      if (!pixmap) {
         cairo_t *cr;
         cairo_pattern_t* pat;
 
@@ -237,8 +238,7 @@ static gboolean on_viewport_expose( GtkW
         cairo_fill(cr);
         cairo_pattern_destroy(pat);
         cairo_destroy(cr);
-
-/*
+      } else {
         GdkGC* gc = gdk_gc_new(evt->window);
 
         gdk_gc_set_tile( gc, pixmap );
@@ -248,7 +248,7 @@ static gboolean on_viewport_expose( GtkW
         gdk_draw_rectangle( evt->window, gc, TRUE, evt->area.x, evt->area.y, evt->area.width, evt->area.height );
 
         gdk_gc_unref( gc );
-*/
+      }
     }
 
     // call handler of tha parent GtkContainer class to propagate the event to children
@@ -524,7 +524,7 @@ static void create_notebook_pages()
 		GtkWidget* image;
 		GtkWidget* go_up_bar = gtk_hbox_new( FALSE, 2 );
 		GdkPixbuf* pixbuf=NULL;
-		GdkPixmap* pixmap;
+		GdkPixmap* pixmap=NULL;
 		GdkGC *pixmap_gc=NULL;
 		char* file;
         PageData* page_data;
@@ -573,11 +573,9 @@ static void create_notebook_pages()
 
         // set background
         gtk_widget_set_app_paintable( viewport, TRUE );
-/*
-        file = g_build_filename( BACKGROUND_DIR, groups[i].background, NULL );
+        file = g_build_filename( BACKGROUND_DIR, gmenu_tree_directory_get_menu_id(dir), NULL );
         pixbuf = gdk_pixbuf_new_from_file( file, NULL );
         g_free( file );
-*/
         if( pixbuf )
         {
             pixmap = gdk_pixmap_new( gdk_get_default_root_window(), gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf), -1 );