diff -u drivel-3.0.0/debian/changelog drivel-3.0.0/debian/changelog --- drivel-3.0.0/debian/changelog +++ drivel-3.0.0/debian/changelog @@ -1,3 +1,10 @@ +drivel (3.0.0-2ubuntu1ppa1) lucid; urgency=low + + * Fix https://bugs.launchpad.net/ubuntu/+source/drivel/+bug/554196 and + https://bugs.launchpad.net/ubuntu/+source/drivel/+bug/650493 + + -- Jean-Baptiste Lab Sun, 21 Nov 2010 08:29:09 +0100 + drivel (3.0.0-2) unstable; urgency=low * Override compile flags with -Wno-error as a temporary fix only in patch2: unchanged: --- drivel-3.0.0.orig/src/dialogs.c +++ drivel-3.0.0/src/dialogs.c @@ -1327,7 +1327,8 @@ GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, - msg); + "%s", + msg); gtk_dialog_add_buttons (GTK_DIALOG (dialog), GTK_STOCK_NO, GTK_RESPONSE_REJECT, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_SAVE, @@ -1363,7 +1364,8 @@ GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, - msg); + "%s", + msg); gtk_dialog_add_buttons (GTK_DIALOG (dialog), GTK_STOCK_NO, GTK_RESPONSE_REJECT, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, only in patch2: unchanged: --- drivel-3.0.0.orig/src/network.c +++ drivel-3.0.0/src/network.c @@ -255,9 +255,9 @@ { bytes_transferred += chunk->length; } - - gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR(dc->progressbar), - bytes_transferred / content_length); + if(content_length) + gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR(dc->progressbar), + bytes_transferred / content_length); g_timeout_add (3000, clear_progress, NULL); return; only in patch2: unchanged: --- drivel-3.0.0.orig/src/blog_lj.c +++ drivel-3.0.0/src/blog_lj.c @@ -252,7 +252,8 @@ GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_INFO, GTK_BUTTONS_OK, - message); + "%s", + message); gtk_dialog_run (GTK_DIALOG (dialog)); only in patch2: unchanged: --- drivel-3.0.0.orig/src/main.c +++ drivel-3.0.0/src/main.c @@ -73,6 +73,7 @@ GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, + "%s", error_string); gtk_dialog_run (GTK_DIALOG (dialog));