[arch-commits] Commit in gwget/trunk (PKGBUILD drop-libgnomeui.patch)
Balló György
bgyorgy at nymeria.archlinux.org
Wed Jul 3 13:32:59 UTC 2013
Date: Wednesday, July 3, 2013 @ 15:32:59
Author: bgyorgy
Revision: 93449
upgpkg: gwget 1.0.4-6
Fix crasher when toolbar_style setting is NULL
Modified:
gwget/trunk/PKGBUILD
gwget/trunk/drop-libgnomeui.patch
-----------------------+
PKGBUILD | 4 +-
drop-libgnomeui.patch | 65 +++++++++++++++++++++++++++++++++++++-----------
2 files changed, 53 insertions(+), 16 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-07-03 13:31:40 UTC (rev 93448)
+++ PKGBUILD 2013-07-03 13:32:59 UTC (rev 93449)
@@ -7,7 +7,7 @@
pkgname=gwget
pkgver=1.0.4
-pkgrel=5
+pkgrel=6
pkgdesc="Download manager for GNOME"
arch=('i686' 'x86_64')
url="http://projects.gnome.org/gwget/"
@@ -22,7 +22,7 @@
sha256sums=('a65b2b2b3befb6cf34a697a13111b35498a6d63f9a9b048a22b8654f35ef643f'
'84efbbea9c2a91c60288edb67264bbdb4ec2c579cf95b3baa8282040a1b65c76'
'319c4795d0034c4adacf302db697d966ca228fc1bbe9778af9dadcfb0c2531c8'
- '72506677886deb5fc2436c667e2f79ed868ce9384cad77b9a97ec68e41ae45c3')
+ '465216f441271fffdd4530bc07829e733e0d3476fdc34f1f028da82cfc05373d')
build() {
cd "$srcdir/$pkgname-$pkgver"
Modified: drop-libgnomeui.patch
===================================================================
--- drop-libgnomeui.patch 2013-07-03 13:31:40 UTC (rev 93448)
+++ drop-libgnomeui.patch 2013-07-03 13:32:59 UTC (rev 93449)
@@ -1,6 +1,6 @@
diff -Naur gwget-1.0.4.orig/configure.ac gwget-1.0.4/configure.ac
---- gwget-1.0.4.orig/configure.ac 2009-10-17 22:26:09.000000000 +0200
-+++ gwget-1.0.4/configure.ac 2012-03-10 01:09:09.246869284 +0100
+--- gwget-1.0.4.orig/configure.ac 2013-07-03 14:43:02.845220000 +0200
++++ gwget-1.0.4/configure.ac 2013-07-03 14:43:57.003180469 +0200
@@ -14,15 +14,13 @@
AM_GCONF_SOURCE_2
@@ -21,7 +21,7 @@
diff -Naur gwget-1.0.4.orig/src/custom-cell-renderer-progressbar.c gwget-1.0.4/src/custom-cell-renderer-progressbar.c
--- gwget-1.0.4.orig/src/custom-cell-renderer-progressbar.c 2009-06-16 19:58:06.000000000 +0200
-+++ gwget-1.0.4/src/custom-cell-renderer-progressbar.c 2012-03-10 01:09:09.260201828 +0100
++++ gwget-1.0.4/src/custom-cell-renderer-progressbar.c 2013-07-03 14:43:57.003180469 +0200
@@ -21,8 +21,8 @@
#include <config.h>
@@ -35,7 +35,7 @@
diff -Naur gwget-1.0.4.orig/src/gwget-application.c gwget-1.0.4/src/gwget-application.c
--- gwget-1.0.4.orig/src/gwget-application.c 2009-06-20 10:12:37.000000000 +0200
-+++ gwget-1.0.4/src/gwget-application.c 2012-03-10 01:09:09.263534966 +0100
++++ gwget-1.0.4/src/gwget-application.c 2013-07-03 14:43:57.003180469 +0200
@@ -21,8 +21,6 @@
#include "gwget-application.h"
@@ -95,7 +95,7 @@
diff -Naur gwget-1.0.4.orig/src/main.c gwget-1.0.4/src/main.c
--- gwget-1.0.4.orig/src/main.c 2009-06-20 10:12:37.000000000 +0200
-+++ gwget-1.0.4/src/main.c 2012-03-10 01:09:09.273534378 +0100
++++ gwget-1.0.4/src/main.c 2013-07-03 14:43:57.003180469 +0200
@@ -17,11 +17,13 @@
#include <config.h>
@@ -146,7 +146,7 @@
}
diff -Naur gwget-1.0.4.orig/src/main_window.c gwget-1.0.4/src/main_window.c
--- gwget-1.0.4.orig/src/main_window.c 2009-08-14 19:19:51.000000000 +0200
-+++ gwget-1.0.4/src/main_window.c 2012-03-10 01:09:09.276867514 +0100
++++ gwget-1.0.4/src/main_window.c 2013-07-03 14:46:01.992833090 +0200
@@ -15,7 +15,9 @@
*/
@@ -158,9 +158,46 @@
#include <gconf/gconf-client.h>
#include <glib/gstdio.h>
#include <string.h>
+@@ -118,20 +120,22 @@
+ toolbar = GTK_WIDGET (gtk_builder_get_object(builder,"toolbar1"));
+ toolbar_setting = gconf_client_get_string(gconf_client,"/desktop/gnome/interface/toolbar_style",NULL);
+
+- if (!strcmp(toolbar_setting,"icons")) {
+- gtk_toolbar_set_style(GTK_TOOLBAR(toolbar),GTK_TOOLBAR_ICONS);
+- }
+-
+- if (!strcmp(toolbar_setting,"both")) {
+- gtk_toolbar_set_style(GTK_TOOLBAR(toolbar),GTK_TOOLBAR_BOTH);
+- }
+-
+- if (!strcmp(toolbar_setting,"both-horiz")) {
+- gtk_toolbar_set_style(GTK_TOOLBAR(toolbar),GTK_TOOLBAR_BOTH_HORIZ);
+- }
+-
+- if (!strcmp(toolbar_setting,"text")) {
+- gtk_toolbar_set_style(GTK_TOOLBAR(toolbar),GTK_TOOLBAR_TEXT);
++ if (toolbar_setting!=NULL) {
++ if (!strcmp(toolbar_setting,"icons")) {
++ gtk_toolbar_set_style(GTK_TOOLBAR(toolbar),GTK_TOOLBAR_ICONS);
++ }
++
++ if (!strcmp(toolbar_setting,"both")) {
++ gtk_toolbar_set_style(GTK_TOOLBAR(toolbar),GTK_TOOLBAR_BOTH);
++ }
++
++ if (!strcmp(toolbar_setting,"both-horiz")) {
++ gtk_toolbar_set_style(GTK_TOOLBAR(toolbar),GTK_TOOLBAR_BOTH_HORIZ);
++ }
++
++ if (!strcmp(toolbar_setting,"text")) {
++ gtk_toolbar_set_style(GTK_TOOLBAR(toolbar),GTK_TOOLBAR_TEXT);
++ }
+ }
+
+ /* Listen to changes to the key. */
diff -Naur gwget-1.0.4.orig/src/main_window_cb.c gwget-1.0.4/src/main_window_cb.c
--- gwget-1.0.4.orig/src/main_window_cb.c 2009-08-14 19:19:51.000000000 +0200
-+++ gwget-1.0.4/src/main_window_cb.c 2012-03-10 01:07:57.131122811 +0100
++++ gwget-1.0.4/src/main_window_cb.c 2013-07-03 14:43:57.003180469 +0200
@@ -15,7 +15,9 @@
*/
@@ -172,7 +209,7 @@
#include <gconf/gconf-client.h>
#include <signal.h>
-@@ -217,7 +220,10 @@
+@@ -217,7 +219,10 @@
gchar *size;
int width = 16, height = 16;
gdouble perc;
@@ -184,7 +221,7 @@
gtk_list_store_append (GTK_LIST_STORE(model), &iter);
size = g_strdup_printf ("%d kB", (guint32)(gwgetdata->cur_size + 512) / 1024);
gtk_list_store_set (GTK_LIST_STORE(model), &iter,URL_COLUMN,gwgetdata->url,
-@@ -243,10 +249,15 @@
+@@ -243,10 +248,15 @@
theme = gtk_icon_theme_get_default ();
if (!gwgetdata->recursive) {
content_type = g_content_type_guess (gwgetdata->local_filename, NULL, 0, NULL);
@@ -205,7 +242,7 @@
width *= 2;
diff -Naur gwget-1.0.4.orig/src/new_window.c gwget-1.0.4/src/new_window.c
--- gwget-1.0.4.orig/src/new_window.c 2009-08-14 19:19:51.000000000 +0200
-+++ gwget-1.0.4/src/new_window.c 2012-03-10 01:09:09.283533785 +0100
++++ gwget-1.0.4/src/new_window.c 2013-07-03 14:43:57.003180469 +0200
@@ -24,7 +24,8 @@
*/
@@ -217,8 +254,8 @@
#include "new_window.h"
#include "main_window.h"
diff -Naur gwget-1.0.4.orig/src/systray.c gwget-1.0.4/src/systray.c
---- gwget-1.0.4.orig/src/systray.c 2009-08-14 19:19:51.000000000 +0200
-+++ gwget-1.0.4/src/systray.c 2012-03-10 01:09:09.290200060 +0100
+--- gwget-1.0.4.orig/src/systray.c 2013-07-03 14:43:02.845220000 +0200
++++ gwget-1.0.4/src/systray.c 2013-07-03 14:43:57.006513881 +0200
@@ -1,6 +1,7 @@
#include <config.h>
@@ -230,7 +267,7 @@
#include "systray.h"
diff -Naur gwget-1.0.4.orig/src/utils.c gwget-1.0.4/src/utils.c
--- gwget-1.0.4.orig/src/utils.c 2009-08-14 19:19:51.000000000 +0200
-+++ gwget-1.0.4/src/utils.c 2012-03-10 01:09:09.296866335 +0100
++++ gwget-1.0.4/src/utils.c 2013-07-03 14:43:57.006513881 +0200
@@ -14,7 +14,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
@@ -243,7 +280,7 @@
#include "gwget_data.h"
diff -Naur gwget-1.0.4.orig/src/wget-log.c gwget-1.0.4/src/wget-log.c
--- gwget-1.0.4.orig/src/wget-log.c 2009-10-04 20:29:35.000000000 +0200
-+++ gwget-1.0.4/src/wget-log.c 2012-03-10 01:09:09.306865743 +0100
++++ gwget-1.0.4/src/wget-log.c 2013-07-03 14:43:57.006513881 +0200
@@ -25,7 +25,9 @@
#define _FILE_OFFSET_BITS 64
More information about the arch-commits
mailing list