[SCM] wavbreaker/master: 02-gtk_deprecated_calls.patch: Properly replace GTK+'s deprecated functions.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 98f888650f25d01d4cfa0dd4cfb28d178eb7ca45
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed May 18 00:37:26 2011 +0200

    02-gtk_deprecated_calls.patch: Properly replace GTK+'s deprecated functions.

diff --git a/debian/patches/02-gtk_deprecated_calls.patch b/debian/patches/02-gtk_deprecated_calls.patch
new file mode 100644
index 0000000..e41babf
--- /dev/null
+++ b/debian/patches/02-gtk_deprecated_calls.patch
@@ -0,0 +1,122 @@
+Description: Properly replace deprecated GTK+ functions.
+Origin: upstream, commit:293
+Applied-Upstream:
+ http://wavbreaker.svn.sf.net/viewvc/wavbreaker?view=revision&revision=293
+---
+ src/wavbreaker.c |   27 ++++++++++++++-------------
+ 1 file changed, 14 insertions(+), 13 deletions(-)
+
+--- wavbreaker.orig/src/wavbreaker.c
++++ wavbreaker/src/wavbreaker.c
+@@ -458,7 +458,7 @@ void moodbar_open_file( gchar* filename,
+         moodbarData.frames[pos].red = tmp[0]*(65535/255);
+         moodbarData.frames[pos].green = tmp[1]*(65535/255);
+         moodbarData.frames[pos].blue = tmp[2]*(65535/255);
+-        gdk_color_alloc( gtk_widget_get_colormap(main_window), &(moodbarData.frames[pos]));
++        gdk_colormap_alloc_color ( gtk_widget_get_colormap(main_window), &(moodbarData.frames[pos]), TRUE, TRUE);
+         pos++;
+     }
+ 
+@@ -1486,7 +1486,7 @@ static void open_file() {
+ 
+     menu_stop(NULL, NULL);
+ 
+-    idle_func_num = gtk_idle_add(file_open_progress_idle_func, NULL);
++    idle_func_num = g_idle_add(file_open_progress_idle_func, NULL);
+     set_title( basename( sample_filename));
+ }
+ 
+@@ -1623,12 +1623,12 @@ void set_sample_filename(const char *f)
+ static void force_redraw()
+ {
+     if( sample_pixmap) {
+-        gdk_pixmap_unref( sample_pixmap);
++        g_object_unref( sample_pixmap);
+         sample_pixmap = NULL;
+     }
+ 
+     if( summary_pixmap) {
+-        gdk_pixmap_unref( summary_pixmap);
++        g_object_unref( summary_pixmap);
+         summary_pixmap = NULL;
+     }
+ 
+@@ -1642,7 +1642,7 @@ static void redraw()
+     if( redraw_done) {
+         /* Only redraw if the last operation finished already. */
+         redraw_done = 0;
+-        gtk_idle_add( redraw_later, &redraw_done);
++        g_idle_add( redraw_later, &redraw_done);
+     }
+ }
+ 
+@@ -1689,7 +1689,7 @@ static void draw_sample(GtkWidget *widge
+     }
+ 
+     if (sample_pixmap) {
+-        gdk_pixmap_unref(sample_pixmap);
++        g_object_unref(sample_pixmap);
+     }
+ 
+     sample_pixmap = gdk_pixmap_new(widget->window, width, height, -1);
+@@ -1987,7 +1987,7 @@ static void draw_summary_pixmap(GtkWidge
+     }
+ 
+     if (summary_pixmap) {
+-        gdk_pixmap_unref(summary_pixmap);
++        g_object_unref(summary_pixmap);
+     }
+ 
+     summary_pixmap = gdk_pixmap_new(widget->window, width, height, -1);
+@@ -2084,7 +2084,7 @@ static void draw_summary_pixmap(GtkWidge
+                 new_color->red = MOODBAR_BLEND( new_color->red, moodbarData.frames[moodbar_pos].red);
+                 new_color->green = MOODBAR_BLEND( new_color->green, moodbarData.frames[moodbar_pos].green);
+                 new_color->blue = MOODBAR_BLEND( new_color->blue, moodbarData.frames[moodbar_pos].blue);
+-                gdk_color_alloc( gtk_widget_get_colormap(main_window), new_color);
++                gdk_colormap_alloc_color( gtk_widget_get_colormap(main_window), new_color, TRUE, TRUE);
+             }
+             gdk_gc_set_foreground(gc, new_color);
+             gdk_draw_line(summary_pixmap, gc, i, y_min+(xaxis-y_min)*shade/SAMPLE_SHADES, i, y_min+(xaxis-y_min)*(shade+1)/SAMPLE_SHADES);
+@@ -2379,7 +2379,7 @@ static void menu_play(GtkWidget *widget,
+     play_marker = cursor_marker;
+     switch (play_sample(cursor_marker, &play_marker)) {
+         case 0:
+-            idle_func_num = gtk_idle_add(file_play_progress_idle_func, NULL);
++            idle_func_num = g_idle_add(file_play_progress_idle_func, NULL);
+             set_stop_icon();
+             break;
+         case 1:
+@@ -2483,7 +2483,7 @@ static void menu_save_as(gpointer callba
+ void wavbreaker_write_files(char *dirname) {
+     sample_write_files(track_break_list, &write_info, dirname);
+ 
+-    idle_func_num = gtk_idle_add(file_write_progress_idle_func, NULL);
++    idle_func_num = g_idle_add(file_write_progress_idle_func, NULL);
+ }
+ 
+ static void menu_export(gpointer callback_data, guint callback_action, GtkWidget *widget)
+@@ -3060,12 +3060,13 @@ int main(int argc, char **argv)
+     bg_color.red   =
+     bg_color.green =
+     bg_color.blue  = 255*(65535/255);
+-    gdk_color_alloc(gtk_widget_get_colormap(main_window), &bg_color);
++    gdk_colormap_alloc_color (gtk_widget_get_colormap(main_window), &bg_color, TRUE, TRUE);
++
+ 
+     nowrite_color.red   = 
+     nowrite_color.green =
+     nowrite_color.blue  = 220*(65535/255);
+-    gdk_color_alloc(gtk_widget_get_colormap(main_window), &nowrite_color);
++    gdk_colormap_alloc_color (gtk_widget_get_colormap(main_window), &nowrite_color, TRUE, TRUE);
+ 
+     for( i=0; i<SAMPLE_COLORS; i++) {
+         for( x=0; x<SAMPLE_SHADES; x++) {
+@@ -3074,7 +3075,7 @@ int main(int argc, char **argv)
+             sample_colors[i][x].red = sample_colors_values[i][0]*factor_color+255*factor_white;
+             sample_colors[i][x].green = sample_colors_values[i][1]*factor_color+255*factor_white;
+             sample_colors[i][x].blue = sample_colors_values[i][2]*factor_color+255*factor_white;
+-            gdk_color_alloc( gtk_widget_get_colormap(main_window), &sample_colors[i][x]);
++            gdk_colormap_alloc_color (gtk_widget_get_colormap(main_window), &sample_colors[i][x], TRUE, TRUE);
+         }
+     }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 663a7b6..586e799 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01-spanish_translation.patch
+02-gtk_deprecated_calls.patch

-- 
wavbreaker packaging