diff -Nru /tmp/CINQh9wWfF/synaptic-0.60ubuntu5/configure /tmp/KbDencFpPO/synaptic-0.60ubuntu5.1/configure --- /tmp/CINQh9wWfF/synaptic-0.60ubuntu5/configure 2007-10-04 19:21:40.000000000 +0200 +++ /tmp/KbDencFpPO/synaptic-0.60ubuntu5.1/configure 2007-10-17 11:16:12.000000000 +0200 @@ -2172,7 +2172,7 @@ # Define the identity of the package. PACKAGE=synaptic - VERSION=0.60ubuntu5 + VERSION=0.60ubuntu5.1 cat >>confdefs.h <<_ACEOF diff -Nru /tmp/CINQh9wWfF/synaptic-0.60ubuntu5/configure.in /tmp/KbDencFpPO/synaptic-0.60ubuntu5.1/configure.in --- /tmp/CINQh9wWfF/synaptic-0.60ubuntu5/configure.in 2007-10-04 19:10:13.000000000 +0200 +++ /tmp/KbDencFpPO/synaptic-0.60ubuntu5.1/configure.in 2007-10-17 11:16:04.000000000 +0200 @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(configure.in) -AM_INIT_AUTOMAKE(synaptic, 0.60ubuntu5) +AM_INIT_AUTOMAKE(synaptic, 0.60ubuntu5.1) AM_CONFIG_HEADER(config.h) AM_MAINTAINER_MODE diff -Nru /tmp/CINQh9wWfF/synaptic-0.60ubuntu5/debian/changelog /tmp/KbDencFpPO/synaptic-0.60ubuntu5.1/debian/changelog --- /tmp/CINQh9wWfF/synaptic-0.60ubuntu5/debian/changelog 2007-10-04 19:20:42.000000000 +0200 +++ /tmp/KbDencFpPO/synaptic-0.60ubuntu5.1/debian/changelog 2007-10-17 11:16:01.000000000 +0200 @@ -1,3 +1,10 @@ +synaptic (0.60ubuntu5.1) gutsy-proposed; urgency=low + + * gtk/rgfetchprogress.{cc,h}: + - fix crash in download progress on theme changes (LP: #67995) + + -- Michael Vogt Wed, 17 Oct 2007 11:14:03 +0200 + synaptic (0.60ubuntu5) gutsy; urgency=low [ Loic Minier ] @@ -9,7 +16,7 @@ -- Loic Minier Wed, 03 Oct 2007 22:33:28 +0200 -synaptic (0.60ubuntu4) gutsy; urgency=low +synaptic (0.61) unstable; urgency=low [ Michael Vogt ] * fix missing Basque translation (closes: #429460) @@ -25,6 +32,8 @@ * make it build with g++ 4.3 * gtk/rgmainwindow.cc: - fix crash in cbInstallFromVersion() + * gtk/rgfetchprogress.{cc,h}: + - fix crash in download progress on theme changes [ Loic Minier ] * Set has_focus on the close button of the welcome dialog; closes: #148695. diff -Nru /tmp/CINQh9wWfF/synaptic-0.60ubuntu5/gtk/rgfetchprogress.cc /tmp/KbDencFpPO/synaptic-0.60ubuntu5.1/gtk/rgfetchprogress.cc --- /tmp/CINQh9wWfF/synaptic-0.60ubuntu5/gtk/rgfetchprogress.cc 2006-12-20 17:29:37.000000000 +0100 +++ /tmp/KbDencFpPO/synaptic-0.60ubuntu5.1/gtk/rgfetchprogress.cc 2007-10-17 11:13:18.000000000 +0200 @@ -142,12 +142,6 @@ // dialogs that come up) gtk_window_set_urgency_hint(GTK_WINDOW(_win), FALSE); - GtkStyle *style = gtk_widget_get_style(_win); - _font = style->font_desc; - _gc = style->white_gc; - _barGC = style->bg_gc[0]; - _textGC = style->black_gc; - // emit a signal if the user changed the cursor g_signal_connect(G_OBJECT(_table), "cursor-changed", G_CALLBACK(cursorChanged), this); @@ -383,6 +377,17 @@ char *str = ""; GdkPixmap *pix; int px, pw; + GdkGC *_barGC; + GdkGC *_gc; + GdkGC *_textGC; + PangoFontDescription *_font; + GtkStyle *style; + + style = gtk_widget_get_style(_win); + _font = style->font_desc; + _gc = style->white_gc; + _barGC = style->bg_gc[0]; + _textGC = style->black_gc; pix = gdk_pixmap_new(_win->window, width, height, -1); diff -Nru /tmp/CINQh9wWfF/synaptic-0.60ubuntu5/gtk/rgfetchprogress.h /tmp/KbDencFpPO/synaptic-0.60ubuntu5.1/gtk/rgfetchprogress.h --- /tmp/CINQh9wWfF/synaptic-0.60ubuntu5/gtk/rgfetchprogress.h 2006-12-20 17:29:37.000000000 +0100 +++ /tmp/KbDencFpPO/synaptic-0.60ubuntu5.1/gtk/rgfetchprogress.h 2007-10-17 11:13:18.000000000 +0200 @@ -68,10 +68,6 @@ void refreshTable(int row, bool append = false); GdkPixmap *statusDraw(int width, int height, int status); - GdkGC *_barGC; - GdkGC *_gc; - GdkGC *_textGC; - PangoFontDescription *_font; public: virtual bool MediaChange(string Media, string Drive);