diff options
Diffstat (limited to 'community/gwget/drop-libgnomeui.patch')
| -rw-r--r-- | community/gwget/drop-libgnomeui.patch | 65 |
1 files changed, 51 insertions, 14 deletions
diff --git a/community/gwget/drop-libgnomeui.patch b/community/gwget/drop-libgnomeui.patch index 30a121f25..7f1f551a6 100644 --- a/community/gwget/drop-libgnomeui.patch +++ b/community/gwget/drop-libgnomeui.patch @@ -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/configure.ac gwget-1.0.4/configure.ac 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/custom-cell-renderer-progressbar.c gwget-1.0.4/s 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/gwget-application.c gwget-1.0.4/src/gwget-applic 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.c gwget-1.0.4/src/main.c } 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 @@ diff -Naur gwget-1.0.4.orig/src/main_window.c gwget-1.0.4/src/main_window.c #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 @@ diff -Naur gwget-1.0.4.orig/src/main_window_cb.c gwget-1.0.4/src/main_window_cb. #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 @@ diff -Naur gwget-1.0.4.orig/src/main_window_cb.c gwget-1.0.4/src/main_window_cb. 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 @@ diff -Naur gwget-1.0.4.orig/src/main_window_cb.c gwget-1.0.4/src/main_window_cb. 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 @@ diff -Naur gwget-1.0.4.orig/src/new_window.c gwget-1.0.4/src/new_window.c #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 @@ diff -Naur gwget-1.0.4.orig/src/systray.c gwget-1.0.4/src/systray.c #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 @@ diff -Naur gwget-1.0.4.orig/src/utils.c gwget-1.0.4/src/utils.c #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 |