[arch-commits] Commit in gwget/repos/community-x86_64 (13 files)
Balló György
bgyorgy at archlinux.org
Fri Jan 19 11:14:12 UTC 2018
Date: Friday, January 19, 2018 @ 11:14:10
Author: bgyorgy
Revision: 284165
archrelease: copy trunk to community-x86_64
Added:
gwget/repos/community-x86_64/PKGBUILD
(from rev 284163, gwget/trunk/PKGBUILD)
gwget/repos/community-x86_64/drop-libgnomeui.patch
(from rev 284163, gwget/trunk/drop-libgnomeui.patch)
gwget/repos/community-x86_64/gtk3-port.patch
(from rev 284163, gwget/trunk/gtk3-port.patch)
gwget/repos/community-x86_64/gwget-1.0.4-glib-2.32.patch
(from rev 284163, gwget/trunk/gwget-1.0.4-glib-2.32.patch)
gwget/repos/community-x86_64/gwget-1.0.4-notify-0.7.patch
(from rev 284163, gwget/trunk/gwget-1.0.4-notify-0.7.patch)
gwget/repos/community-x86_64/various-fixes.patch
(from rev 284163, gwget/trunk/various-fixes.patch)
gwget/repos/community-x86_64/wget.patch
(from rev 284163, gwget/trunk/wget.patch)
Deleted:
gwget/repos/community-x86_64/PKGBUILD
gwget/repos/community-x86_64/drop-libgnomeui.patch
gwget/repos/community-x86_64/gtk3-port.patch
gwget/repos/community-x86_64/gwget-1.0.4-glib-2.32.patch
gwget/repos/community-x86_64/gwget-1.0.4-notify-0.7.patch
gwget/repos/community-x86_64/wget.patch
------------------------------+
PKGBUILD | 129 +++---
drop-libgnomeui.patch | 580 +++++++++++++++---------------
gtk3-port.patch | 770 ++++++++++++++++++++---------------------
gwget-1.0.4-glib-2.32.patch | 24 -
gwget-1.0.4-notify-0.7.patch | 48 +-
various-fixes.patch | 126 ++++++
wget.patch | 26 -
7 files changed, 917 insertions(+), 786 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-01-19 11:13:57 UTC (rev 284164)
+++ PKGBUILD 2018-01-19 11:14:10 UTC (rev 284165)
@@ -1,62 +0,0 @@
-# $Id$
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-# Contributor: Allan McRae <allan at archlinux.org>
-# Contributor: Aaron, phrakture, Griffin <aaron at archlinux.org>
-# Contributor: erkaN kaplaN <erkan at linux-sevenler.org>
-# Contributor: Alexsandr Pavlov <kidoz at mail dot ru>
-
-pkgname=gwget
-pkgver=1.0.4
-pkgrel=10
-pkgdesc="Download manager for GNOME"
-arch=('i686' 'x86_64')
-url="http://projects.gnome.org/gwget/"
-license=('GPL')
-depends=('gtk3' 'gconf' 'libnotify' 'wget')
-makedepends=('intltool')
-source=(https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
- gwget-1.0.4-notify-0.7.patch
- gwget-1.0.4-glib-2.32.patch
- drop-libgnomeui.patch
- gtk3-port.patch
- wget.patch)
-sha256sums=('a65b2b2b3befb6cf34a697a13111b35498a6d63f9a9b048a22b8654f35ef643f'
- '84efbbea9c2a91c60288edb67264bbdb4ec2c579cf95b3baa8282040a1b65c76'
- '319c4795d0034c4adacf302db697d966ca228fc1bbe9778af9dadcfb0c2531c8'
- 'afc5a92f9652d19a200a32b1081fb2b928fec42153795a4c77eaac99352fa9de'
- 'e85e3eeb091bd88bf11866c6256cd36c375f456d07599a9e6a15400fa26546f8'
- '3900defbf161a657ef3968a0aa1df27605e1fbf6fc34d0fcba748ce274fa4f3c')
-
-prepare() {
- cd $pkgname-$pkgver
-
- # https://bugzilla.gnome.org/show_bug.cgi?id=634170
- patch -Np1 -i ../gwget-1.0.4-notify-0.7.patch
-
- # https://bugzilla.gnome.org/show_bug.cgi?id=665286
- patch -Np1 -i ../gwget-1.0.4-glib-2.32.patch
-
- # https://bugzilla.gnome.org/show_bug.cgi?id=671759
- patch -Np1 -i ../drop-libgnomeui.patch
-
- # Port to GTK+ 3
- patch -Np1 -i ../gtk3-port.patch
-
- # Fix with recent wget versions
- patch -Np1 -i ../wget.patch
-
- autoreconf -fi
-}
-
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
- --disable-schemas-install \
- --with-gconf-schema-file-dir=/usr/share/gconf/schemas
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-}
Copied: gwget/repos/community-x86_64/PKGBUILD (from rev 284163, gwget/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-01-19 11:14:10 UTC (rev 284165)
@@ -0,0 +1,67 @@
+# $Id$
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Allan McRae <allan at archlinux.org>
+# Contributor: Aaron, phrakture, Griffin <aaron at archlinux.org>
+# Contributor: erkaN kaplaN <erkan at linux-sevenler.org>
+# Contributor: Alexsandr Pavlov <kidoz at mail dot ru>
+
+pkgname=gwget
+pkgver=1.0.4
+pkgrel=11
+pkgdesc="Download manager for GNOME"
+arch=('x86_64')
+url="https://projects.gnome.org/gwget/"
+license=('GPL')
+depends=('gtk3' 'gconf' 'libnotify' 'wget')
+makedepends=('intltool')
+source=(https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
+ gwget-1.0.4-notify-0.7.patch
+ gwget-1.0.4-glib-2.32.patch
+ drop-libgnomeui.patch
+ gtk3-port.patch
+ wget.patch
+ various-fixes.patch)
+sha256sums=('a65b2b2b3befb6cf34a697a13111b35498a6d63f9a9b048a22b8654f35ef643f'
+ '84efbbea9c2a91c60288edb67264bbdb4ec2c579cf95b3baa8282040a1b65c76'
+ '319c4795d0034c4adacf302db697d966ca228fc1bbe9778af9dadcfb0c2531c8'
+ 'afc5a92f9652d19a200a32b1081fb2b928fec42153795a4c77eaac99352fa9de'
+ 'e85e3eeb091bd88bf11866c6256cd36c375f456d07599a9e6a15400fa26546f8'
+ '3900defbf161a657ef3968a0aa1df27605e1fbf6fc34d0fcba748ce274fa4f3c'
+ '9e45add4dbdaa397de4aa985887e722e97541fbc59cec4dfa82287efc695ee87')
+
+prepare() {
+ cd $pkgname-$pkgver
+
+ # https://bugzilla.gnome.org/show_bug.cgi?id=634170
+ patch -Np1 -i ../gwget-1.0.4-notify-0.7.patch
+
+ # https://bugzilla.gnome.org/show_bug.cgi?id=665286
+ patch -Np1 -i ../gwget-1.0.4-glib-2.32.patch
+
+ # https://bugzilla.gnome.org/show_bug.cgi?id=671759
+ patch -Np1 -i ../drop-libgnomeui.patch
+
+ # Port to GTK+ 3
+ patch -Np1 -i ../gtk3-port.patch
+
+ # Fix with recent wget versions
+ patch -Np1 -i ../wget.patch
+
+ # Set fallback destination path properly, don't try to start downloading existing URL
+ patch -Np1 -i ../various-fixes.patch
+
+ autoreconf -fi
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+ --disable-schemas-install \
+ --with-gconf-schema-file-dir=/usr/share/gconf/schemas
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
Deleted: drop-libgnomeui.patch
===================================================================
--- drop-libgnomeui.patch 2018-01-19 11:13:57 UTC (rev 284164)
+++ drop-libgnomeui.patch 2018-01-19 11:14:10 UTC (rev 284165)
@@ -1,290 +0,0 @@
-diff -Naur gwget-1.0.4.orig/configure.ac gwget-1.0.4/configure.ac
---- gwget-1.0.4.orig/configure.ac 2013-07-04 02:34:53.853338000 +0200
-+++ gwget-1.0.4/configure.ac 2013-07-04 02:35:57.021516447 +0200
-@@ -14,15 +14,13 @@
-
- AM_GCONF_SOURCE_2
-
--LIBGNOMEUI_REQUIRED=2.0.0
--LIBGNOME_REQUIRED=2.0.0
- GTK_REQUIRED=2.6.0
- GCONF_REQUIRED=1.1.11
- DBUS_GLIB_REQUIRED=0.33
- GIO_REQUIRED=2.16.0
-
--PKG_CHECK_MODULES(GNOME, libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED
-- gtk+-2.0 >= $GTK_REQUIRED
-+PKG_CHECK_MODULES(GNOME, gtk+-2.0 >= $GTK_REQUIRED
-+ gconf-2.0
- gmodule-2.0
- gio-unix-2.0 >= $GIO_REQUIRED)
-
-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 2013-07-04 02:35:57.024849860 +0200
-@@ -21,8 +21,8 @@
-
- #include <config.h>
- #include <stdlib.h>
--#include <gnome.h>
--/* #include <glib/gi18n.h> */
-+#include <glib/gi18n.h>
-+#include <gtk/gtk.h>
-
- #include "custom-cell-renderer-progressbar.h"
-
-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 2013-07-04 02:35:57.024849860 +0200
-@@ -21,8 +21,6 @@
- #include "gwget-application.h"
-
-
--#include <libgnomeui/gnome-client.h>
--
- #ifdef ENABLE_DBUS
- #include "gwget-application-service.h"
- #include <dbus/dbus-glib-bindings.h>
-@@ -86,39 +84,6 @@
- #endif /* ENABLE_DBUS */
-
-
--static gint
--save_session (GnomeClient *client, gint phase, GnomeSaveStyle save_style, gint shutdown,
-- GnomeInteractStyle interact_style, gint fast, GwgetApplication *application)
--{
-- char **restart_argv;
-- int argc = 0;
--
-- restart_argv = g_new (char *, 1);
-- restart_argv[0] = g_strdup ("gwget");
-- gnome_client_set_restart_command (client, argc, restart_argv);
--
-- return TRUE;
--}
--
--static void
--removed_from_session (GnomeClient *client, GwgetApplication *application)
--{
-- gwget_application_shutdown (application);
--}
--
--static void
--init_session (GwgetApplication *application)
--{
-- GnomeClient *client;
--
-- client = gnome_master_client ();
--
-- g_signal_connect (client, "save_yourself",
-- G_CALLBACK (save_session), application);
-- g_signal_connect (client, "die",
-- G_CALLBACK (removed_from_session), application);
--}
--
- gboolean
- gwget_application_open_window (GwgetApplication *application,
- guint32 timestamp,
-@@ -199,7 +164,6 @@
- static void
- gwget_application_init (GwgetApplication *gwget_application)
- {
-- init_session (gwget_application);
-
- }
-
-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 2013-07-04 02:35:57.024849860 +0200
-@@ -17,11 +17,13 @@
-
- #include <config.h>
-
--#include <gnome.h>
-+#include <stdlib.h>
-+#include <errno.h>
-+#include <glib/gi18n.h>
-+#include <gtk/gtk.h>
- #include <string.h>
- #include <gconf/gconf-client.h>
- #include <locale.h>
--#include <libgnomeui/libgnomeui.h>
- #include <gio/gio.h>
-
- #include "main_window_cb.h"
-@@ -201,7 +203,6 @@
-
- int main(int argc,char *argv[])
- {
-- GnomeProgram *program;
- GOptionContext *context;
-
- context = g_option_context_new (_("Gwget Download Manager"));
-@@ -220,12 +221,7 @@
-
-
- gwget_init_pref(&gwget_pref);
-- program = gnome_program_init(PACKAGE, VERSION,
-- LIBGNOMEUI_MODULE, argc, argv,
-- GNOME_PARAM_GOPTION_CONTEXT, context,
-- GNOME_PARAM_HUMAN_READABLE_NAME, _("Gwget"),
-- GNOME_PARAM_APP_DATADIR, GNOME_GWGET_LOCALEDIR,
-- NULL);
-+ gtk_init (&argc, &argv);
-
- #ifdef ENABLE_DBUS
- if (!gwget_application_register_service (GWGET_APP)) {
-@@ -243,9 +239,5 @@
-
- gtk_main();
-
-- gnome_accelerators_sync ();
--
-- g_object_unref (program);
--
- return (0);
- }
-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 2013-07-04 02:35:57.024849860 +0200
-@@ -15,7 +15,9 @@
- */
-
- #include <config.h>
--#include <gnome.h>
-+#include <stdlib.h>
-+#include <glib/gi18n.h>
-+#include <gtk/gtk.h>
- #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 2013-07-04 02:45:43.468873631 +0200
-@@ -15,7 +15,9 @@
- */
-
- #include <config.h>
--#include <gnome.h>
-+#include <stdlib.h>
-+#include <glib/gi18n.h>
-+#include <gtk/gtk.h>
- #include <gconf/gconf-client.h>
- #include <signal.h>
-
-@@ -217,6 +219,9 @@
- gchar *size;
- int width = 16, height = 16;
- gdouble perc;
-+ GIcon *icon;
-+ const gchar *const *icon_names;
-+ gint i;
-
- gtk_list_store_append (GTK_LIST_STORE(model), &iter);
- size = g_strdup_printf ("%d kB", (guint32)(gwgetdata->cur_size + 512) / 1024);
-@@ -243,8 +248,14 @@
- theme = gtk_icon_theme_get_default ();
- if (!gwgetdata->recursive) {
- content_type = g_content_type_guess (gwgetdata->local_filename, NULL, 0, NULL);
-- gwgetdata->icon_name = gnome_icon_lookup (theme, NULL, NULL, NULL, NULL,
-- content_type, GNOME_ICON_LOOKUP_FLAGS_NONE, NULL);
-+ icon = g_content_type_get_icon (content_type);
-+ icon_names = g_themed_icon_get_names (G_THEMED_ICON (icon));
-+ for (i=0; i < g_strv_length ((gchar **)icon_names); i++) {
-+ if (gtk_icon_theme_has_icon (gtk_icon_theme_get_default (), icon_names[i])) {
-+ gwgetdata->icon_name = g_strdup (icon_names[i]);
-+ break;
-+ }
-+ }
- } else {
- gwgetdata->icon_name = g_strdup("gtk-refresh");
- }
-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 2013-07-04 02:35:57.028183273 +0200
-@@ -24,7 +24,8 @@
- */
-
-
--#include <gnome.h>
-+#include <glib/gi18n.h>
-+#include <gtk/gtk.h>
- #include <config.h>
- #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 2013-07-04 02:34:53.920006000 +0200
-+++ gwget-1.0.4/src/systray.c 2013-07-04 02:35:57.028183273 +0200
-@@ -1,6 +1,7 @@
-
- #include <config.h>
--#include <gnome.h>
-+#include <glib/gi18n.h>
-+#include <gtk/gtk.h>
- #include "main_window.h"
- #include "gwget_data.h"
- #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 2013-07-04 02:35:57.028183273 +0200
-@@ -14,7 +14,8 @@
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
--#include <gnome.h>
-+#include <string.h>
-+#include <gtk/gtk.h>
- #include "main_window.h"
- #include "utils.h"
- #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 2013-07-04 02:35:57.028183273 +0200
-@@ -25,7 +25,9 @@
- #define _FILE_OFFSET_BITS 64
-
- #include <config.h>
--#include <gnome.h>
-+#include <stdlib.h>
-+#include <glib/gi18n.h>
-+#include <gtk/gtk.h>
- #include <string.h>
- #include <sys/stat.h>
- #include <unistd.h>
Copied: gwget/repos/community-x86_64/drop-libgnomeui.patch (from rev 284163, gwget/trunk/drop-libgnomeui.patch)
===================================================================
--- drop-libgnomeui.patch (rev 0)
+++ drop-libgnomeui.patch 2018-01-19 11:14:10 UTC (rev 284165)
@@ -0,0 +1,290 @@
+diff -Naur gwget-1.0.4.orig/configure.ac gwget-1.0.4/configure.ac
+--- gwget-1.0.4.orig/configure.ac 2013-07-04 02:34:53.853338000 +0200
++++ gwget-1.0.4/configure.ac 2013-07-04 02:35:57.021516447 +0200
+@@ -14,15 +14,13 @@
+
+ AM_GCONF_SOURCE_2
+
+-LIBGNOMEUI_REQUIRED=2.0.0
+-LIBGNOME_REQUIRED=2.0.0
+ GTK_REQUIRED=2.6.0
+ GCONF_REQUIRED=1.1.11
+ DBUS_GLIB_REQUIRED=0.33
+ GIO_REQUIRED=2.16.0
+
+-PKG_CHECK_MODULES(GNOME, libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED
+- gtk+-2.0 >= $GTK_REQUIRED
++PKG_CHECK_MODULES(GNOME, gtk+-2.0 >= $GTK_REQUIRED
++ gconf-2.0
+ gmodule-2.0
+ gio-unix-2.0 >= $GIO_REQUIRED)
+
+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 2013-07-04 02:35:57.024849860 +0200
+@@ -21,8 +21,8 @@
+
+ #include <config.h>
+ #include <stdlib.h>
+-#include <gnome.h>
+-/* #include <glib/gi18n.h> */
++#include <glib/gi18n.h>
++#include <gtk/gtk.h>
+
+ #include "custom-cell-renderer-progressbar.h"
+
+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 2013-07-04 02:35:57.024849860 +0200
+@@ -21,8 +21,6 @@
+ #include "gwget-application.h"
+
+
+-#include <libgnomeui/gnome-client.h>
+-
+ #ifdef ENABLE_DBUS
+ #include "gwget-application-service.h"
+ #include <dbus/dbus-glib-bindings.h>
+@@ -86,39 +84,6 @@
+ #endif /* ENABLE_DBUS */
+
+
+-static gint
+-save_session (GnomeClient *client, gint phase, GnomeSaveStyle save_style, gint shutdown,
+- GnomeInteractStyle interact_style, gint fast, GwgetApplication *application)
+-{
+- char **restart_argv;
+- int argc = 0;
+-
+- restart_argv = g_new (char *, 1);
+- restart_argv[0] = g_strdup ("gwget");
+- gnome_client_set_restart_command (client, argc, restart_argv);
+-
+- return TRUE;
+-}
+-
+-static void
+-removed_from_session (GnomeClient *client, GwgetApplication *application)
+-{
+- gwget_application_shutdown (application);
+-}
+-
+-static void
+-init_session (GwgetApplication *application)
+-{
+- GnomeClient *client;
+-
+- client = gnome_master_client ();
+-
+- g_signal_connect (client, "save_yourself",
+- G_CALLBACK (save_session), application);
+- g_signal_connect (client, "die",
+- G_CALLBACK (removed_from_session), application);
+-}
+-
+ gboolean
+ gwget_application_open_window (GwgetApplication *application,
+ guint32 timestamp,
+@@ -199,7 +164,6 @@
+ static void
+ gwget_application_init (GwgetApplication *gwget_application)
+ {
+- init_session (gwget_application);
+
+ }
+
+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 2013-07-04 02:35:57.024849860 +0200
+@@ -17,11 +17,13 @@
+
+ #include <config.h>
+
+-#include <gnome.h>
++#include <stdlib.h>
++#include <errno.h>
++#include <glib/gi18n.h>
++#include <gtk/gtk.h>
+ #include <string.h>
+ #include <gconf/gconf-client.h>
+ #include <locale.h>
+-#include <libgnomeui/libgnomeui.h>
+ #include <gio/gio.h>
+
+ #include "main_window_cb.h"
+@@ -201,7 +203,6 @@
+
+ int main(int argc,char *argv[])
+ {
+- GnomeProgram *program;
+ GOptionContext *context;
+
+ context = g_option_context_new (_("Gwget Download Manager"));
+@@ -220,12 +221,7 @@
+
+
+ gwget_init_pref(&gwget_pref);
+- program = gnome_program_init(PACKAGE, VERSION,
+- LIBGNOMEUI_MODULE, argc, argv,
+- GNOME_PARAM_GOPTION_CONTEXT, context,
+- GNOME_PARAM_HUMAN_READABLE_NAME, _("Gwget"),
+- GNOME_PARAM_APP_DATADIR, GNOME_GWGET_LOCALEDIR,
+- NULL);
++ gtk_init (&argc, &argv);
+
+ #ifdef ENABLE_DBUS
+ if (!gwget_application_register_service (GWGET_APP)) {
+@@ -243,9 +239,5 @@
+
+ gtk_main();
+
+- gnome_accelerators_sync ();
+-
+- g_object_unref (program);
+-
+ return (0);
+ }
+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 2013-07-04 02:35:57.024849860 +0200
+@@ -15,7 +15,9 @@
+ */
+
+ #include <config.h>
+-#include <gnome.h>
++#include <stdlib.h>
++#include <glib/gi18n.h>
++#include <gtk/gtk.h>
+ #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 2013-07-04 02:45:43.468873631 +0200
+@@ -15,7 +15,9 @@
+ */
+
+ #include <config.h>
+-#include <gnome.h>
++#include <stdlib.h>
++#include <glib/gi18n.h>
++#include <gtk/gtk.h>
+ #include <gconf/gconf-client.h>
+ #include <signal.h>
+
+@@ -217,6 +219,9 @@
+ gchar *size;
+ int width = 16, height = 16;
+ gdouble perc;
++ GIcon *icon;
++ const gchar *const *icon_names;
++ gint i;
+
+ gtk_list_store_append (GTK_LIST_STORE(model), &iter);
+ size = g_strdup_printf ("%d kB", (guint32)(gwgetdata->cur_size + 512) / 1024);
+@@ -243,8 +248,14 @@
+ theme = gtk_icon_theme_get_default ();
+ if (!gwgetdata->recursive) {
+ content_type = g_content_type_guess (gwgetdata->local_filename, NULL, 0, NULL);
+- gwgetdata->icon_name = gnome_icon_lookup (theme, NULL, NULL, NULL, NULL,
+- content_type, GNOME_ICON_LOOKUP_FLAGS_NONE, NULL);
++ icon = g_content_type_get_icon (content_type);
++ icon_names = g_themed_icon_get_names (G_THEMED_ICON (icon));
++ for (i=0; i < g_strv_length ((gchar **)icon_names); i++) {
++ if (gtk_icon_theme_has_icon (gtk_icon_theme_get_default (), icon_names[i])) {
++ gwgetdata->icon_name = g_strdup (icon_names[i]);
++ break;
++ }
++ }
+ } else {
+ gwgetdata->icon_name = g_strdup("gtk-refresh");
+ }
+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 2013-07-04 02:35:57.028183273 +0200
+@@ -24,7 +24,8 @@
+ */
+
+
+-#include <gnome.h>
++#include <glib/gi18n.h>
++#include <gtk/gtk.h>
+ #include <config.h>
+ #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 2013-07-04 02:34:53.920006000 +0200
++++ gwget-1.0.4/src/systray.c 2013-07-04 02:35:57.028183273 +0200
+@@ -1,6 +1,7 @@
+
+ #include <config.h>
+-#include <gnome.h>
++#include <glib/gi18n.h>
++#include <gtk/gtk.h>
+ #include "main_window.h"
+ #include "gwget_data.h"
+ #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 2013-07-04 02:35:57.028183273 +0200
+@@ -14,7 +14,8 @@
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+-#include <gnome.h>
++#include <string.h>
++#include <gtk/gtk.h>
+ #include "main_window.h"
+ #include "utils.h"
+ #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 2013-07-04 02:35:57.028183273 +0200
+@@ -25,7 +25,9 @@
+ #define _FILE_OFFSET_BITS 64
+
+ #include <config.h>
+-#include <gnome.h>
++#include <stdlib.h>
++#include <glib/gi18n.h>
++#include <gtk/gtk.h>
+ #include <string.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
Deleted: gtk3-port.patch
===================================================================
--- gtk3-port.patch 2018-01-19 11:13:57 UTC (rev 284164)
+++ gtk3-port.patch 2018-01-19 11:14:10 UTC (rev 284165)
@@ -1,385 +0,0 @@
-diff -Naur gwget-1.0.4.orig/configure.ac gwget-1.0.4/configure.ac
---- gwget-1.0.4.orig/configure.ac 2014-12-19 00:00:13.449718000 +0100
-+++ gwget-1.0.4/configure.ac 2014-12-19 01:45:42.784569280 +0100
-@@ -14,12 +14,25 @@
-
- AM_GCONF_SOURCE_2
-
-+AC_ARG_ENABLE([gtk3],
-+ [AC_HELP_STRING([--enable-gtk3],
-+ [compile gwget against gtk+ 3.0 (default: yes)])],
-+ [enable_gtk3="${enableval}"],
-+ [enable_gtk3="yes"]
-+)
-+
-+if test x"$enable_gtk3" = x"yes"; then
-+ GTK_API_VERSION="3.0"
-+else
-+ GTK_API_VERSION="2.0"
-+fi
-+
- GTK_REQUIRED=2.6.0
- GCONF_REQUIRED=1.1.11
- DBUS_GLIB_REQUIRED=0.33
- GIO_REQUIRED=2.16.0
-
--PKG_CHECK_MODULES(GNOME, gtk+-2.0 >= $GTK_REQUIRED
-+PKG_CHECK_MODULES(GNOME, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
- gconf-2.0
- gmodule-2.0
- gio-unix-2.0 >= $GIO_REQUIRED)
-diff -Naur gwget-1.0.4.orig/data/gwget.ui gwget-1.0.4/data/gwget.ui
---- gwget-1.0.4.orig/data/gwget.ui 2009-10-17 22:18:33.000000000 +0200
-+++ gwget-1.0.4/data/gwget.ui 2014-12-19 00:15:18.775347588 +0100
-@@ -424,7 +424,6 @@
- <property name="resizable">False</property>
- <property name="window_position">center-on-parent</property>
- <property name="type_hint">normal</property>
-- <property name="has_separator">False</property>
- <child internal-child="vbox">
- <object class="GtkVBox" id="dialog-vbox1">
- <property name="visible">True</property>
-@@ -908,8 +907,9 @@
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
-- <object class="GtkComboBoxEntry" id="save_in_comboboxentry">
-+ <object class="GtkComboBox" id="save_in_comboboxentry">
- <property name="visible">True</property>
-+ <property name="has-entry">True</property>
- </object>
- <packing>
- <property name="position">0</property>
-diff -Naur gwget-1.0.4.orig/po/POTFILES.in gwget-1.0.4/po/POTFILES.in
---- gwget-1.0.4.orig/po/POTFILES.in 2009-08-14 19:19:51.000000000 +0200
-+++ gwget-1.0.4/po/POTFILES.in 2014-12-19 03:38:43.516402402 +0100
-@@ -6,7 +6,6 @@
- data/gwget.ui
- data/preferences.ui
- epiphany-extension/gwget.xml.in.in
--src/custom-cell-renderer-progressbar.c
- src/gwget_data.c
- src/main.c
- src/main_window.c
-diff -Naur gwget-1.0.4.orig/src/gwget_data.c gwget-1.0.4/src/gwget_data.c
---- gwget-1.0.4.orig/src/gwget_data.c 2009-08-14 19:19:51.000000000 +0200
-+++ gwget-1.0.4/src/gwget_data.c 2014-12-19 01:12:21.445521846 +0100
-@@ -491,8 +491,8 @@
-
- gwgetdata->log_fd = pipe_fd[0];
- fcntl (gwgetdata->log_fd, F_SETFL, O_NONBLOCK);
-- gwgetdata->log_tag = gtk_timeout_add (1000,
-- (GtkFunction) gwget_data_process_information,
-+ gwgetdata->log_tag = g_timeout_add (1000,
-+ (GSourceFunc)gwget_data_process_information,
- gwgetdata);
- }
-
-@@ -621,7 +621,7 @@
- kill (data->wget_pid, SIGKILL);
-
- /* Remove callback that communicates with wget */
-- gtk_timeout_remove (data->log_tag);
-+ g_source_remove (data->log_tag);
-
- /* Wait the finish of wget */
- child_pid = waitpid (data->wget_pid, &status, WUNTRACED);
-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 2014-12-19 00:00:13.449718000 +0100
-+++ gwget-1.0.4/src/main_window.c 2014-12-19 03:36:32.706530494 +0100
-@@ -27,7 +27,6 @@
- #include "main_window.h"
- #include "main_window_cb.h"
- #include "gwget_data.h"
--#include "custom-cell-renderer-progressbar.h"
- #include "utils.h"
- #include "systray.h"
- #include "new_window.h"
-@@ -186,8 +185,8 @@
- save_in_model = (GtkTreeModel*)gtk_list_store_new (1, G_TYPE_STRING);
- combo = GTK_WIDGET (gtk_builder_get_object (builder, "save_in_comboboxentry"));
- gtk_combo_box_set_model(GTK_COMBO_BOX(combo), save_in_model);
-- gtk_combo_box_entry_set_text_column (GTK_COMBO_BOX_ENTRY(combo), 0);
-- gtk_entry_set_text(GTK_ENTRY(GTK_BIN(combo)->child), gwget_pref.download_dir);
-+ gtk_combo_box_set_entry_text_column (GTK_COMBO_BOX(combo), 0);
-+ gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(combo))), gwget_pref.download_dir);
-
- }
-
-@@ -489,7 +488,7 @@
- gtk_tree_view_append_column (treeview, column);
-
- /* Percentage */
-- renderer = ephy_cell_renderer_progress_new();
-+ renderer = gtk_cell_renderer_progress_new();
- column = gtk_tree_view_column_new_with_attributes (_("Percentage"),
- renderer,
- "value",
-@@ -558,7 +557,7 @@
-
- drop_ok = FALSE;
- if (dnd_type==TARGET_URI_LIST) {
-- uris = g_uri_list_extract_uris ((gchar *)seldata->data);
-+ uris = g_uri_list_extract_uris ((gchar *)gtk_selection_data_get_data(seldata));
- for (i=0; uris[i] != NULL; i++) {
- files = g_list_prepend (files, uris[i]);
- }
-@@ -566,7 +565,7 @@
- file = g_list_first(files)->data;
- drop_ok = TRUE;
- } else if (dnd_type==TARGET_NETSCAPE_URL) {
-- file=((gchar *) (seldata->data));
-+ file=((gchar *) (gtk_selection_data_get_data(seldata)));
- drop_ok = TRUE;
- } else {
- gtk_drag_finish(context, FALSE, TRUE, time);
-@@ -728,16 +727,20 @@
- gwget_remember_window_size_and_position(void)
- {
- GtkWidget *main_window;
-- GtkAllocation *allocation;
-+ GtkAllocation allocation;
- gint position_x,position_y;
- GConfChangeSet *cs;
-
-- /* Remember the size of the window */
- main_window=GTK_WIDGET (gtk_builder_get_object(builder,"main_window"));
-- allocation= &(GTK_WIDGET (main_window)->allocation);
-+
-+ if (!gtk_widget_get_visible(main_window))
-+ return FALSE;
-+
-+ /* Remember the size of the window */
-+ gtk_widget_get_allocation (main_window, &allocation);
- cs = gconf_change_set_new ();
-- gconf_change_set_set_int (cs, "/apps/gwget2/default_height", allocation->height);
-- gconf_change_set_set_int (cs, "/apps/gwget2/default_width", allocation->width);
-+ gconf_change_set_set_int (cs, "/apps/gwget2/default_height", allocation.height);
-+ gconf_change_set_set_int (cs, "/apps/gwget2/default_width", allocation.width);
-
- /* Remember the position */
- gtk_window_get_position(GTK_WINDOW(main_window), &position_x, &position_y);
-@@ -771,7 +774,7 @@
- /* When load again we can known the number of directories to load */
- gconf_client_set_int(gconf_client,"/apps/gwget2/n_downloads",length,NULL);
-
-- gtk_tree_model_get_iter_root(model,&iter);
-+ gtk_tree_model_get_iter_first(model,&iter);
- /* Save current downloads in GConf */
- /* Calculate if there are any dl in retriving state */
- for (i=0;i<length;i++) {
-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 2014-12-19 00:00:13.449718000 +0100
-+++ gwget-1.0.4/src/main_window_cb.c 2014-12-19 00:00:46.080477412 +0100
-@@ -128,7 +128,7 @@
- gchar *url;
-
- length=gtk_tree_model_iter_n_children(GTK_TREE_MODEL(model),NULL);
-- gtk_tree_model_get_iter_root(model,&iter);
-+ gtk_tree_model_get_iter_first(model,&iter);
- for (i=0;i<length;i++) {
- gtk_tree_model_get (model, &iter, URL_COLUMN, &url, -1);
- gwgetdata=g_object_get_data(G_OBJECT(model),url);
-@@ -151,7 +151,7 @@
- gchar *url;
-
- length=gtk_tree_model_iter_n_children(GTK_TREE_MODEL(model),NULL);
-- gtk_tree_model_get_iter_root(model,&iter);
-+ gtk_tree_model_get_iter_first(model,&iter);
- for (i=0;i<length;i++) {
- gtk_tree_model_get (model, &iter, URL_COLUMN, &url, -1);
- gwgetdata=g_object_get_data(G_OBJECT(model),url);
-@@ -670,7 +670,7 @@
- response = run_dialog(_("Remove completed"),_("Really remove completed downloads from the list?"), GTK_STOCK_CANCEL, _("Remove"));
- if (response == GTK_RESPONSE_OK) {
- length=gtk_tree_model_iter_n_children(GTK_TREE_MODEL(model),NULL);
-- gtk_tree_model_get_iter_root(model,&iter);
-+ gtk_tree_model_get_iter_first(model,&iter);
- for (i=0;i<length;i++) {
- gtk_tree_model_get (model, &iter, URL_COLUMN, &url, -1);
- gwgetdata=g_object_get_data(G_OBJECT(model),url);
-@@ -704,7 +704,7 @@
- response = run_dialog(_("Remove inactive"),_("Really remove inactive downloads from the list?"), GTK_STOCK_CANCEL, _("Remove inactive"));
- if (response == GTK_RESPONSE_OK) {
- length=gtk_tree_model_iter_n_children(GTK_TREE_MODEL(model),NULL);
-- gtk_tree_model_get_iter_root(model,&iter);
-+ gtk_tree_model_get_iter_first(model,&iter);
- for (i=0;i<length;i++) {
- gtk_tree_model_get (model, &iter, URL_COLUMN, &url, -1);
- gwgetdata=g_object_get_data(G_OBJECT(model),url);
-@@ -736,7 +736,7 @@
- response = run_dialog(_("Remove all"),_("Really remove all downloads from the list?"), GTK_STOCK_CANCEL, _("Remove all"));
- if (response == GTK_RESPONSE_OK) {
- length=gtk_tree_model_iter_n_children(GTK_TREE_MODEL(model),NULL);
-- gtk_tree_model_get_iter_root(model,&iter);
-+ gtk_tree_model_get_iter_first(model,&iter);
- for (i=0;i<length;i++) {
- gtk_tree_model_get (model, &iter, URL_COLUMN, &url, -1);
- gwgetdata=g_object_get_data(G_OBJECT(model),url);
-@@ -1106,7 +1106,7 @@
- gboolean inprogress;
-
- length = gtk_tree_model_iter_n_children(GTK_TREE_MODEL(model), NULL);
-- gtk_tree_model_get_iter_root(model, &iter);
-+ gtk_tree_model_get_iter_first(model, &iter);
-
- inprogress = FALSE;
- for (i=0;i<length;i++) {
-@@ -1136,7 +1136,7 @@
- gchar *url;
-
- length=gtk_tree_model_iter_n_children(GTK_TREE_MODEL(model),NULL);
-- gtk_tree_model_get_iter_root(model,&iter);
-+ gtk_tree_model_get_iter_first(model,&iter);
- for (i=0;i<length;i++) {
- gtk_tree_model_get (model, &iter, URL_COLUMN, &url, -1);
- gwgetdata=g_object_get_data(G_OBJECT(model),url);
-@@ -1233,7 +1233,7 @@
- response = run_dialog (message, _("Really remove this download from the list?"), GTK_STOCK_CANCEL, _("Remove download"));
- if (response == GTK_RESPONSE_OK) {
- length=gtk_tree_model_iter_n_children(GTK_TREE_MODEL(model),NULL);
-- gtk_tree_model_get_iter_root(model,&iter);
-+ gtk_tree_model_get_iter_first(model,&iter);
- for (i=0;i<length;i++) {
- gtk_tree_model_get (model, &iter, URL_COLUMN, &url, -1);
- if (gwgetdata==g_object_get_data(G_OBJECT(model),url)) {
-diff -Naur gwget-1.0.4.orig/src/Makefile.am gwget-1.0.4/src/Makefile.am
---- gwget-1.0.4.orig/src/Makefile.am 2009-06-16 19:58:06.000000000 +0200
-+++ gwget-1.0.4/src/Makefile.am 2014-12-19 03:38:28.989379757 +0100
-@@ -35,8 +35,6 @@
- wget-log.h\
- utils.c\
- utils.h\
-- custom-cell-renderer-progressbar.c\
-- custom-cell-renderer-progressbar.h\
- new_window.c\
- new_window.h\
- systray.c \
-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 2014-12-19 00:00:13.449718000 +0100
-+++ gwget-1.0.4/src/new_window.c 2014-12-19 03:03:59.146165898 +0100
-@@ -47,13 +47,17 @@
-
- window = GTK_WIDGET (gtk_builder_get_object(builder, "new_window"));
- combo = GTK_WIDGET (gtk_builder_get_object (builder, "save_in_comboboxentry"));
-- save_in_entry=GTK_ENTRY(GTK_BIN(combo)->child);
-+ save_in_entry=GTK_ENTRY(gtk_bin_get_child(GTK_BIN(combo)));
-
-- url=g_strstrip((gchar *)(gtk_entry_get_text (GTK_ENTRY(GTK_WIDGET (gtk_builder_get_object(builder, "url_entry"))))));
-+ url=gtk_entry_get_text (GTK_ENTRY(GTK_WIDGET (gtk_builder_get_object(builder, "url_entry"))));
-
- if (strcmp(url,"")) {
- url = g_strdup(url);
-- save_in=g_strdup(gtk_combo_box_get_active_text (GTK_COMBO_BOX( GTK_WIDGET (gtk_builder_get_object(builder, "save_in_comboboxentry")))));
-+ url = g_strstrip(url);
-+ }
-+
-+ if (strcmp(url,"")) {
-+ save_in=g_strdup(gtk_entry_get_text (GTK_ENTRY(save_in_entry)));
-
- if (!strcmp(save_in,"") && gwget_pref.download_dir) {
- save_in=g_strdup(gwget_pref.download_dir);
-@@ -133,7 +137,7 @@
- NULL);
-
- combo = GTK_WIDGET (gtk_builder_get_object (builder, "save_in_comboboxentry"));
-- save_in_entry=GTK_ENTRY(GTK_BIN(combo)->child);
-+ save_in_entry=GTK_ENTRY(gtk_bin_get_child(GTK_BIN(combo)));
-
- if (gtk_dialog_run (GTK_DIALOG (filesel)) == GTK_RESPONSE_ACCEPT) {
- char *directory;
-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 2014-12-19 00:00:13.453051000 +0100
-+++ gwget-1.0.4/src/systray.c 2014-12-19 00:00:42.077050940 +0100
-@@ -110,9 +110,9 @@
-
- item = gtk_image_menu_item_new_from_stock(GTK_STOCK_NEW, NULL);
- gtk_menu_shell_append(GTK_MENU_SHELL(systray_menu), item);
-- gtk_signal_connect (GTK_OBJECT (item), "activate",
-- GTK_SIGNAL_FUNC(on_button_new_clicked),
-- NULL);
-+ g_signal_connect (G_OBJECT (item), "activate",
-+ G_CALLBACK(on_button_new_clicked),
-+ NULL);
-
- gtk_widget_show(item);
- downloads_menu = GTK_MENU(gtk_menu_new());
-@@ -131,23 +131,23 @@
-
- item = gtk_image_menu_item_new_from_stock(GTK_STOCK_PREFERENCES, NULL);
- gtk_menu_shell_append(GTK_MENU_SHELL(systray_menu), item);
-- gtk_signal_connect (GTK_OBJECT (item), "activate",
-- GTK_SIGNAL_FUNC(on_boton_pref_clicked),
-- NULL);
-+ g_signal_connect (G_OBJECT (item), "activate",
-+ G_CALLBACK(on_boton_pref_clicked),
-+ NULL);
-
- item = gtk_separator_menu_item_new();
- gtk_menu_shell_append(GTK_MENU_SHELL(systray_menu), item);
- item = gtk_image_menu_item_new_from_stock(GTK_STOCK_QUIT, NULL);
- gtk_menu_shell_append(GTK_MENU_SHELL(systray_menu), item);
-- gtk_signal_connect (GTK_OBJECT (item), "activate",
-- GTK_SIGNAL_FUNC(gwget_quit),
-- NULL);
-+ g_signal_connect (G_OBJECT (item), "activate",
-+ G_CALLBACK(gwget_quit),
-+ NULL);
- /* show */
- gtk_widget_show_all(GTK_WIDGET(systray_menu));
- gtk_menu_popup(GTK_MENU(systray_menu), NULL, NULL, NULL, NULL, button, time);
-
- /* clean up */
-- /* gtk_object_sink(GTK_OBJECT(menu)); */
-+ /* gtk_object_sink(G_OBJECT(menu)); */
-
- return TRUE;
-
-@@ -159,9 +159,9 @@
- GtkWidget *window;
-
- window = GTK_WIDGET (gtk_builder_get_object(builder,"main_window"));
-- if((gdk_window_get_state(GTK_WIDGET(window)->window) &
-+ if((gdk_window_get_state(gtk_widget_get_window(window)) &
- GDK_WINDOW_STATE_ICONIFIED) ||
-- !GTK_WIDGET_VISIBLE(window))
-+ !gtk_widget_get_visible(window))
- gtk_window_present (GTK_WINDOW(window));
- else
- gtk_widget_hide (GTK_WIDGET(window));
-diff -Naur gwget-1.0.4.orig/src/systray.h gwget-1.0.4/src/systray.h
---- gwget-1.0.4.orig/src/systray.h 2009-06-16 19:58:06.000000000 +0200
-+++ gwget-1.0.4/src/systray.h 2014-12-19 03:27:45.803915153 +0100
-@@ -6,7 +6,11 @@
- {
- #endif
-
-+#if GTK_CHECK_VERSION(3, 0, 0)
-+#include <gtk/gtkx.h>
-+#else
- #include <gtk/gtkplug.h>
-+#endif
- #ifdef GDK_WINDOWING_X11
- #include <gdk/gdkx.h>
- #endif
-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 2014-12-19 00:00:13.499719000 +0100
-+++ gwget-1.0.4/src/utils.c 2014-12-19 00:00:48.227194020 +0100
-@@ -102,7 +102,7 @@
- gchar *url;
-
- length=gtk_tree_model_iter_n_children(GTK_TREE_MODEL(model),NULL);
-- gtk_tree_model_get_iter_root(model,&iter);
-+ gtk_tree_model_get_iter_first(model,&iter);
- for (i=0;i<length;i++) {
- gtk_tree_model_get (model, &iter, URL_COLUMN, &url, -1);
- gwgetdata=g_object_get_data(G_OBJECT(model),url);
-@@ -134,7 +134,7 @@
- }
-
- length=gtk_tree_model_iter_n_children(GTK_TREE_MODEL(model),NULL);
-- gtk_tree_model_get_iter_root(model,&iter);
-+ gtk_tree_model_get_iter_first(model,&iter);
- for (i=0;i<length;i++) {
- gtk_tree_model_get (model, &iter, URL_COLUMN, &url, -1);
- gwgetdata=g_object_get_data(G_OBJECT(model),url);
Copied: gwget/repos/community-x86_64/gtk3-port.patch (from rev 284163, gwget/trunk/gtk3-port.patch)
===================================================================
--- gtk3-port.patch (rev 0)
+++ gtk3-port.patch 2018-01-19 11:14:10 UTC (rev 284165)
@@ -0,0 +1,385 @@
+diff -Naur gwget-1.0.4.orig/configure.ac gwget-1.0.4/configure.ac
+--- gwget-1.0.4.orig/configure.ac 2014-12-19 00:00:13.449718000 +0100
++++ gwget-1.0.4/configure.ac 2014-12-19 01:45:42.784569280 +0100
+@@ -14,12 +14,25 @@
+
+ AM_GCONF_SOURCE_2
+
++AC_ARG_ENABLE([gtk3],
++ [AC_HELP_STRING([--enable-gtk3],
++ [compile gwget against gtk+ 3.0 (default: yes)])],
++ [enable_gtk3="${enableval}"],
++ [enable_gtk3="yes"]
++)
++
++if test x"$enable_gtk3" = x"yes"; then
++ GTK_API_VERSION="3.0"
++else
++ GTK_API_VERSION="2.0"
++fi
++
+ GTK_REQUIRED=2.6.0
+ GCONF_REQUIRED=1.1.11
+ DBUS_GLIB_REQUIRED=0.33
+ GIO_REQUIRED=2.16.0
+
+-PKG_CHECK_MODULES(GNOME, gtk+-2.0 >= $GTK_REQUIRED
++PKG_CHECK_MODULES(GNOME, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
+ gconf-2.0
+ gmodule-2.0
+ gio-unix-2.0 >= $GIO_REQUIRED)
+diff -Naur gwget-1.0.4.orig/data/gwget.ui gwget-1.0.4/data/gwget.ui
+--- gwget-1.0.4.orig/data/gwget.ui 2009-10-17 22:18:33.000000000 +0200
++++ gwget-1.0.4/data/gwget.ui 2014-12-19 00:15:18.775347588 +0100
+@@ -424,7 +424,6 @@
+ <property name="resizable">False</property>
+ <property name="window_position">center-on-parent</property>
+ <property name="type_hint">normal</property>
+- <property name="has_separator">False</property>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="dialog-vbox1">
+ <property name="visible">True</property>
+@@ -908,8 +907,9 @@
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+- <object class="GtkComboBoxEntry" id="save_in_comboboxentry">
++ <object class="GtkComboBox" id="save_in_comboboxentry">
+ <property name="visible">True</property>
++ <property name="has-entry">True</property>
+ </object>
+ <packing>
+ <property name="position">0</property>
+diff -Naur gwget-1.0.4.orig/po/POTFILES.in gwget-1.0.4/po/POTFILES.in
+--- gwget-1.0.4.orig/po/POTFILES.in 2009-08-14 19:19:51.000000000 +0200
++++ gwget-1.0.4/po/POTFILES.in 2014-12-19 03:38:43.516402402 +0100
+@@ -6,7 +6,6 @@
+ data/gwget.ui
+ data/preferences.ui
+ epiphany-extension/gwget.xml.in.in
+-src/custom-cell-renderer-progressbar.c
+ src/gwget_data.c
+ src/main.c
+ src/main_window.c
+diff -Naur gwget-1.0.4.orig/src/gwget_data.c gwget-1.0.4/src/gwget_data.c
+--- gwget-1.0.4.orig/src/gwget_data.c 2009-08-14 19:19:51.000000000 +0200
++++ gwget-1.0.4/src/gwget_data.c 2014-12-19 01:12:21.445521846 +0100
+@@ -491,8 +491,8 @@
+
+ gwgetdata->log_fd = pipe_fd[0];
+ fcntl (gwgetdata->log_fd, F_SETFL, O_NONBLOCK);
+- gwgetdata->log_tag = gtk_timeout_add (1000,
+- (GtkFunction) gwget_data_process_information,
++ gwgetdata->log_tag = g_timeout_add (1000,
++ (GSourceFunc)gwget_data_process_information,
+ gwgetdata);
+ }
+
+@@ -621,7 +621,7 @@
+ kill (data->wget_pid, SIGKILL);
+
+ /* Remove callback that communicates with wget */
+- gtk_timeout_remove (data->log_tag);
++ g_source_remove (data->log_tag);
+
+ /* Wait the finish of wget */
+ child_pid = waitpid (data->wget_pid, &status, WUNTRACED);
+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 2014-12-19 00:00:13.449718000 +0100
++++ gwget-1.0.4/src/main_window.c 2014-12-19 03:36:32.706530494 +0100
+@@ -27,7 +27,6 @@
+ #include "main_window.h"
+ #include "main_window_cb.h"
+ #include "gwget_data.h"
+-#include "custom-cell-renderer-progressbar.h"
+ #include "utils.h"
+ #include "systray.h"
+ #include "new_window.h"
+@@ -186,8 +185,8 @@
+ save_in_model = (GtkTreeModel*)gtk_list_store_new (1, G_TYPE_STRING);
+ combo = GTK_WIDGET (gtk_builder_get_object (builder, "save_in_comboboxentry"));
+ gtk_combo_box_set_model(GTK_COMBO_BOX(combo), save_in_model);
+- gtk_combo_box_entry_set_text_column (GTK_COMBO_BOX_ENTRY(combo), 0);
+- gtk_entry_set_text(GTK_ENTRY(GTK_BIN(combo)->child), gwget_pref.download_dir);
++ gtk_combo_box_set_entry_text_column (GTK_COMBO_BOX(combo), 0);
++ gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(combo))), gwget_pref.download_dir);
+
+ }
+
+@@ -489,7 +488,7 @@
+ gtk_tree_view_append_column (treeview, column);
+
+ /* Percentage */
+- renderer = ephy_cell_renderer_progress_new();
++ renderer = gtk_cell_renderer_progress_new();
+ column = gtk_tree_view_column_new_with_attributes (_("Percentage"),
+ renderer,
+ "value",
+@@ -558,7 +557,7 @@
+
+ drop_ok = FALSE;
+ if (dnd_type==TARGET_URI_LIST) {
+- uris = g_uri_list_extract_uris ((gchar *)seldata->data);
++ uris = g_uri_list_extract_uris ((gchar *)gtk_selection_data_get_data(seldata));
+ for (i=0; uris[i] != NULL; i++) {
+ files = g_list_prepend (files, uris[i]);
+ }
+@@ -566,7 +565,7 @@
+ file = g_list_first(files)->data;
+ drop_ok = TRUE;
+ } else if (dnd_type==TARGET_NETSCAPE_URL) {
+- file=((gchar *) (seldata->data));
++ file=((gchar *) (gtk_selection_data_get_data(seldata)));
+ drop_ok = TRUE;
+ } else {
+ gtk_drag_finish(context, FALSE, TRUE, time);
+@@ -728,16 +727,20 @@
+ gwget_remember_window_size_and_position(void)
+ {
+ GtkWidget *main_window;
+- GtkAllocation *allocation;
++ GtkAllocation allocation;
+ gint position_x,position_y;
+ GConfChangeSet *cs;
+
+- /* Remember the size of the window */
+ main_window=GTK_WIDGET (gtk_builder_get_object(builder,"main_window"));
+- allocation= &(GTK_WIDGET (main_window)->allocation);
++
++ if (!gtk_widget_get_visible(main_window))
++ return FALSE;
++
++ /* Remember the size of the window */
++ gtk_widget_get_allocation (main_window, &allocation);
+ cs = gconf_change_set_new ();
+- gconf_change_set_set_int (cs, "/apps/gwget2/default_height", allocation->height);
+- gconf_change_set_set_int (cs, "/apps/gwget2/default_width", allocation->width);
++ gconf_change_set_set_int (cs, "/apps/gwget2/default_height", allocation.height);
++ gconf_change_set_set_int (cs, "/apps/gwget2/default_width", allocation.width);
+
+ /* Remember the position */
+ gtk_window_get_position(GTK_WINDOW(main_window), &position_x, &position_y);
+@@ -771,7 +774,7 @@
+ /* When load again we can known the number of directories to load */
+ gconf_client_set_int(gconf_client,"/apps/gwget2/n_downloads",length,NULL);
+
+- gtk_tree_model_get_iter_root(model,&iter);
++ gtk_tree_model_get_iter_first(model,&iter);
+ /* Save current downloads in GConf */
+ /* Calculate if there are any dl in retriving state */
+ for (i=0;i<length;i++) {
+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 2014-12-19 00:00:13.449718000 +0100
++++ gwget-1.0.4/src/main_window_cb.c 2014-12-19 00:00:46.080477412 +0100
+@@ -128,7 +128,7 @@
+ gchar *url;
+
+ length=gtk_tree_model_iter_n_children(GTK_TREE_MODEL(model),NULL);
+- gtk_tree_model_get_iter_root(model,&iter);
++ gtk_tree_model_get_iter_first(model,&iter);
+ for (i=0;i<length;i++) {
+ gtk_tree_model_get (model, &iter, URL_COLUMN, &url, -1);
+ gwgetdata=g_object_get_data(G_OBJECT(model),url);
+@@ -151,7 +151,7 @@
+ gchar *url;
+
+ length=gtk_tree_model_iter_n_children(GTK_TREE_MODEL(model),NULL);
+- gtk_tree_model_get_iter_root(model,&iter);
++ gtk_tree_model_get_iter_first(model,&iter);
+ for (i=0;i<length;i++) {
+ gtk_tree_model_get (model, &iter, URL_COLUMN, &url, -1);
+ gwgetdata=g_object_get_data(G_OBJECT(model),url);
+@@ -670,7 +670,7 @@
+ response = run_dialog(_("Remove completed"),_("Really remove completed downloads from the list?"), GTK_STOCK_CANCEL, _("Remove"));
+ if (response == GTK_RESPONSE_OK) {
+ length=gtk_tree_model_iter_n_children(GTK_TREE_MODEL(model),NULL);
+- gtk_tree_model_get_iter_root(model,&iter);
++ gtk_tree_model_get_iter_first(model,&iter);
+ for (i=0;i<length;i++) {
+ gtk_tree_model_get (model, &iter, URL_COLUMN, &url, -1);
+ gwgetdata=g_object_get_data(G_OBJECT(model),url);
+@@ -704,7 +704,7 @@
+ response = run_dialog(_("Remove inactive"),_("Really remove inactive downloads from the list?"), GTK_STOCK_CANCEL, _("Remove inactive"));
+ if (response == GTK_RESPONSE_OK) {
+ length=gtk_tree_model_iter_n_children(GTK_TREE_MODEL(model),NULL);
+- gtk_tree_model_get_iter_root(model,&iter);
++ gtk_tree_model_get_iter_first(model,&iter);
+ for (i=0;i<length;i++) {
+ gtk_tree_model_get (model, &iter, URL_COLUMN, &url, -1);
+ gwgetdata=g_object_get_data(G_OBJECT(model),url);
+@@ -736,7 +736,7 @@
+ response = run_dialog(_("Remove all"),_("Really remove all downloads from the list?"), GTK_STOCK_CANCEL, _("Remove all"));
+ if (response == GTK_RESPONSE_OK) {
+ length=gtk_tree_model_iter_n_children(GTK_TREE_MODEL(model),NULL);
+- gtk_tree_model_get_iter_root(model,&iter);
++ gtk_tree_model_get_iter_first(model,&iter);
+ for (i=0;i<length;i++) {
+ gtk_tree_model_get (model, &iter, URL_COLUMN, &url, -1);
+ gwgetdata=g_object_get_data(G_OBJECT(model),url);
+@@ -1106,7 +1106,7 @@
+ gboolean inprogress;
+
+ length = gtk_tree_model_iter_n_children(GTK_TREE_MODEL(model), NULL);
+- gtk_tree_model_get_iter_root(model, &iter);
++ gtk_tree_model_get_iter_first(model, &iter);
+
+ inprogress = FALSE;
+ for (i=0;i<length;i++) {
+@@ -1136,7 +1136,7 @@
+ gchar *url;
+
+ length=gtk_tree_model_iter_n_children(GTK_TREE_MODEL(model),NULL);
+- gtk_tree_model_get_iter_root(model,&iter);
++ gtk_tree_model_get_iter_first(model,&iter);
+ for (i=0;i<length;i++) {
+ gtk_tree_model_get (model, &iter, URL_COLUMN, &url, -1);
+ gwgetdata=g_object_get_data(G_OBJECT(model),url);
+@@ -1233,7 +1233,7 @@
+ response = run_dialog (message, _("Really remove this download from the list?"), GTK_STOCK_CANCEL, _("Remove download"));
+ if (response == GTK_RESPONSE_OK) {
+ length=gtk_tree_model_iter_n_children(GTK_TREE_MODEL(model),NULL);
+- gtk_tree_model_get_iter_root(model,&iter);
++ gtk_tree_model_get_iter_first(model,&iter);
+ for (i=0;i<length;i++) {
+ gtk_tree_model_get (model, &iter, URL_COLUMN, &url, -1);
+ if (gwgetdata==g_object_get_data(G_OBJECT(model),url)) {
+diff -Naur gwget-1.0.4.orig/src/Makefile.am gwget-1.0.4/src/Makefile.am
+--- gwget-1.0.4.orig/src/Makefile.am 2009-06-16 19:58:06.000000000 +0200
++++ gwget-1.0.4/src/Makefile.am 2014-12-19 03:38:28.989379757 +0100
+@@ -35,8 +35,6 @@
+ wget-log.h\
+ utils.c\
+ utils.h\
+- custom-cell-renderer-progressbar.c\
+- custom-cell-renderer-progressbar.h\
+ new_window.c\
+ new_window.h\
+ systray.c \
+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 2014-12-19 00:00:13.449718000 +0100
++++ gwget-1.0.4/src/new_window.c 2014-12-19 03:03:59.146165898 +0100
+@@ -47,13 +47,17 @@
+
+ window = GTK_WIDGET (gtk_builder_get_object(builder, "new_window"));
+ combo = GTK_WIDGET (gtk_builder_get_object (builder, "save_in_comboboxentry"));
+- save_in_entry=GTK_ENTRY(GTK_BIN(combo)->child);
++ save_in_entry=GTK_ENTRY(gtk_bin_get_child(GTK_BIN(combo)));
+
+- url=g_strstrip((gchar *)(gtk_entry_get_text (GTK_ENTRY(GTK_WIDGET (gtk_builder_get_object(builder, "url_entry"))))));
++ url=gtk_entry_get_text (GTK_ENTRY(GTK_WIDGET (gtk_builder_get_object(builder, "url_entry"))));
+
+ if (strcmp(url,"")) {
+ url = g_strdup(url);
+- save_in=g_strdup(gtk_combo_box_get_active_text (GTK_COMBO_BOX( GTK_WIDGET (gtk_builder_get_object(builder, "save_in_comboboxentry")))));
++ url = g_strstrip(url);
++ }
++
++ if (strcmp(url,"")) {
++ save_in=g_strdup(gtk_entry_get_text (GTK_ENTRY(save_in_entry)));
+
+ if (!strcmp(save_in,"") && gwget_pref.download_dir) {
+ save_in=g_strdup(gwget_pref.download_dir);
+@@ -133,7 +137,7 @@
+ NULL);
+
+ combo = GTK_WIDGET (gtk_builder_get_object (builder, "save_in_comboboxentry"));
+- save_in_entry=GTK_ENTRY(GTK_BIN(combo)->child);
++ save_in_entry=GTK_ENTRY(gtk_bin_get_child(GTK_BIN(combo)));
+
+ if (gtk_dialog_run (GTK_DIALOG (filesel)) == GTK_RESPONSE_ACCEPT) {
+ char *directory;
+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 2014-12-19 00:00:13.453051000 +0100
++++ gwget-1.0.4/src/systray.c 2014-12-19 00:00:42.077050940 +0100
+@@ -110,9 +110,9 @@
+
+ item = gtk_image_menu_item_new_from_stock(GTK_STOCK_NEW, NULL);
+ gtk_menu_shell_append(GTK_MENU_SHELL(systray_menu), item);
+- gtk_signal_connect (GTK_OBJECT (item), "activate",
+- GTK_SIGNAL_FUNC(on_button_new_clicked),
+- NULL);
++ g_signal_connect (G_OBJECT (item), "activate",
++ G_CALLBACK(on_button_new_clicked),
++ NULL);
+
+ gtk_widget_show(item);
+ downloads_menu = GTK_MENU(gtk_menu_new());
+@@ -131,23 +131,23 @@
+
+ item = gtk_image_menu_item_new_from_stock(GTK_STOCK_PREFERENCES, NULL);
+ gtk_menu_shell_append(GTK_MENU_SHELL(systray_menu), item);
+- gtk_signal_connect (GTK_OBJECT (item), "activate",
+- GTK_SIGNAL_FUNC(on_boton_pref_clicked),
+- NULL);
++ g_signal_connect (G_OBJECT (item), "activate",
++ G_CALLBACK(on_boton_pref_clicked),
++ NULL);
+
+ item = gtk_separator_menu_item_new();
+ gtk_menu_shell_append(GTK_MENU_SHELL(systray_menu), item);
+ item = gtk_image_menu_item_new_from_stock(GTK_STOCK_QUIT, NULL);
+ gtk_menu_shell_append(GTK_MENU_SHELL(systray_menu), item);
+- gtk_signal_connect (GTK_OBJECT (item), "activate",
+- GTK_SIGNAL_FUNC(gwget_quit),
+- NULL);
++ g_signal_connect (G_OBJECT (item), "activate",
++ G_CALLBACK(gwget_quit),
++ NULL);
+ /* show */
+ gtk_widget_show_all(GTK_WIDGET(systray_menu));
+ gtk_menu_popup(GTK_MENU(systray_menu), NULL, NULL, NULL, NULL, button, time);
+
+ /* clean up */
+- /* gtk_object_sink(GTK_OBJECT(menu)); */
++ /* gtk_object_sink(G_OBJECT(menu)); */
+
+ return TRUE;
+
+@@ -159,9 +159,9 @@
+ GtkWidget *window;
+
+ window = GTK_WIDGET (gtk_builder_get_object(builder,"main_window"));
+- if((gdk_window_get_state(GTK_WIDGET(window)->window) &
++ if((gdk_window_get_state(gtk_widget_get_window(window)) &
+ GDK_WINDOW_STATE_ICONIFIED) ||
+- !GTK_WIDGET_VISIBLE(window))
++ !gtk_widget_get_visible(window))
+ gtk_window_present (GTK_WINDOW(window));
+ else
+ gtk_widget_hide (GTK_WIDGET(window));
+diff -Naur gwget-1.0.4.orig/src/systray.h gwget-1.0.4/src/systray.h
+--- gwget-1.0.4.orig/src/systray.h 2009-06-16 19:58:06.000000000 +0200
++++ gwget-1.0.4/src/systray.h 2014-12-19 03:27:45.803915153 +0100
+@@ -6,7 +6,11 @@
+ {
+ #endif
+
++#if GTK_CHECK_VERSION(3, 0, 0)
++#include <gtk/gtkx.h>
++#else
+ #include <gtk/gtkplug.h>
++#endif
+ #ifdef GDK_WINDOWING_X11
+ #include <gdk/gdkx.h>
+ #endif
+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 2014-12-19 00:00:13.499719000 +0100
++++ gwget-1.0.4/src/utils.c 2014-12-19 00:00:48.227194020 +0100
+@@ -102,7 +102,7 @@
+ gchar *url;
+
+ length=gtk_tree_model_iter_n_children(GTK_TREE_MODEL(model),NULL);
+- gtk_tree_model_get_iter_root(model,&iter);
++ gtk_tree_model_get_iter_first(model,&iter);
+ for (i=0;i<length;i++) {
+ gtk_tree_model_get (model, &iter, URL_COLUMN, &url, -1);
+ gwgetdata=g_object_get_data(G_OBJECT(model),url);
+@@ -134,7 +134,7 @@
+ }
+
+ length=gtk_tree_model_iter_n_children(GTK_TREE_MODEL(model),NULL);
+- gtk_tree_model_get_iter_root(model,&iter);
++ gtk_tree_model_get_iter_first(model,&iter);
+ for (i=0;i<length;i++) {
+ gtk_tree_model_get (model, &iter, URL_COLUMN, &url, -1);
+ gwgetdata=g_object_get_data(G_OBJECT(model),url);
Deleted: gwget-1.0.4-glib-2.32.patch
===================================================================
--- gwget-1.0.4-glib-2.32.patch 2018-01-19 11:13:57 UTC (rev 284164)
+++ gwget-1.0.4-glib-2.32.patch 2018-01-19 11:14:10 UTC (rev 284165)
@@ -1,12 +0,0 @@
-diff -Naur gwget-1.0.4.orig/src/gwget-application.h gwget-1.0.4/src/gwget-application.h
---- gwget-1.0.4.orig/src/gwget-application.h 2012-05-05 12:53:49.679322992 +0000
-+++ gwget-1.0.4/src/gwget-application.h 2012-05-05 12:56:21.481488856 +0000
-@@ -18,7 +18,7 @@
- #ifndef GWGET_APPLICATION_H
- #define GWGET_APPLICATION_H
-
--#include <glib/gerror.h>
-+#include <glib.h>
- #include <glib-object.h>
-
- G_BEGIN_DECLS
Copied: gwget/repos/community-x86_64/gwget-1.0.4-glib-2.32.patch (from rev 284163, gwget/trunk/gwget-1.0.4-glib-2.32.patch)
===================================================================
--- gwget-1.0.4-glib-2.32.patch (rev 0)
+++ gwget-1.0.4-glib-2.32.patch 2018-01-19 11:14:10 UTC (rev 284165)
@@ -0,0 +1,12 @@
+diff -Naur gwget-1.0.4.orig/src/gwget-application.h gwget-1.0.4/src/gwget-application.h
+--- gwget-1.0.4.orig/src/gwget-application.h 2012-05-05 12:53:49.679322992 +0000
++++ gwget-1.0.4/src/gwget-application.h 2012-05-05 12:56:21.481488856 +0000
+@@ -18,7 +18,7 @@
+ #ifndef GWGET_APPLICATION_H
+ #define GWGET_APPLICATION_H
+
+-#include <glib/gerror.h>
++#include <glib.h>
+ #include <glib-object.h>
+
+ G_BEGIN_DECLS
Deleted: gwget-1.0.4-notify-0.7.patch
===================================================================
--- gwget-1.0.4-notify-0.7.patch 2018-01-19 11:13:57 UTC (rev 284164)
+++ gwget-1.0.4-notify-0.7.patch 2018-01-19 11:14:10 UTC (rev 284165)
@@ -1,24 +0,0 @@
-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 2011-03-18 00:24:51.993660191 +0100
-@@ -270,7 +270,7 @@
- #
- # Check for libnotify
- #
--LIBNOTIFY_REQUIRED=0.2.2
-+LIBNOTIFY_REQUIRED=0.7.0
- AC_ARG_ENABLE(libnotify,
- AC_HELP_STRING([--disable-libnotify],
- [Disable libnotify support]),,
-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 2011-03-18 00:24:27.612098913 +0100
-@@ -224,7 +224,7 @@
- if (!notify_is_initted ())
- if (!notify_init ("gwget"))
- return;
-- NotifyNotification *notification = notify_notification_new(primary,secondary,icon_name,NULL);
-+ NotifyNotification *notification = notify_notification_new(primary,secondary,icon_name);
- notify_notification_show(notification,NULL);
- #endif
-
Copied: gwget/repos/community-x86_64/gwget-1.0.4-notify-0.7.patch (from rev 284163, gwget/trunk/gwget-1.0.4-notify-0.7.patch)
===================================================================
--- gwget-1.0.4-notify-0.7.patch (rev 0)
+++ gwget-1.0.4-notify-0.7.patch 2018-01-19 11:14:10 UTC (rev 284165)
@@ -0,0 +1,24 @@
+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 2011-03-18 00:24:51.993660191 +0100
+@@ -270,7 +270,7 @@
+ #
+ # Check for libnotify
+ #
+-LIBNOTIFY_REQUIRED=0.2.2
++LIBNOTIFY_REQUIRED=0.7.0
+ AC_ARG_ENABLE(libnotify,
+ AC_HELP_STRING([--disable-libnotify],
+ [Disable libnotify support]),,
+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 2011-03-18 00:24:27.612098913 +0100
+@@ -224,7 +224,7 @@
+ if (!notify_is_initted ())
+ if (!notify_init ("gwget"))
+ return;
+- NotifyNotification *notification = notify_notification_new(primary,secondary,icon_name,NULL);
++ NotifyNotification *notification = notify_notification_new(primary,secondary,icon_name);
+ notify_notification_show(notification,NULL);
+ #endif
+
Copied: gwget/repos/community-x86_64/various-fixes.patch (from rev 284163, gwget/trunk/various-fixes.patch)
===================================================================
--- various-fixes.patch (rev 0)
+++ various-fixes.patch 2018-01-19 11:14:10 UTC (rev 284165)
@@ -0,0 +1,126 @@
+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 2018-01-19 11:03:01.897778000 +0100
++++ gwget-1.0.4/src/gwget-application.c 2018-01-19 11:14:58.065852512 +0100
+@@ -103,8 +103,9 @@
+
+ gwgetdata = gwget_data_new ((gchar *)url);
+
+- gwget_data_add_download(gwgetdata);
+- gwget_data_start_download(gwgetdata);
++ if (gwget_data_add_download(gwgetdata)) {
++ gwget_data_start_download(gwgetdata);
++ }
+
+ return TRUE;
+ }
+@@ -126,8 +127,9 @@
+ gwgetdata->dir = gwget_pref.download_dir;
+ }
+
+- gwget_data_add_download(gwgetdata);
+- gwget_data_start_download(gwgetdata);
++ if (gwget_data_add_download(gwgetdata)) {
++ gwget_data_start_download(gwgetdata);
++ }
+
+ return TRUE;
+ }
+diff -Naur gwget-1.0.4.orig/src/gwget_data.c gwget-1.0.4/src/gwget_data.c
+--- gwget-1.0.4.orig/src/gwget_data.c 2018-01-19 11:03:01.907778000 +0100
++++ gwget-1.0.4/src/gwget_data.c 2018-01-19 11:41:09.319442608 +0100
+@@ -540,7 +540,12 @@
+ if (length == 0) {
+ dir = gwget_pref.download_dir;
+ }
+-
++
++ length = strlen (dir);
++ if (length == 0) {
++ dir = g_get_home_dir();
++ }
++
+ /* Add a trailing '/' unless already present */
+ length = strlen (dir);
+ if (dir[length - 1] == '/')
+@@ -682,7 +687,7 @@
+ }
+
+ /* Add a gwgetdata to the main window */
+-void
++gboolean
+ gwget_data_add_download(GwgetData *gwgetdata)
+ {
+ gint response;
+@@ -692,7 +697,7 @@
+ if (check_url_already_exists(gwgetdata->url)) {
+ run_dialog_information(_("Unable to add this download"),
+ _("This download is already added"));
+- return;
++ return FALSE;
+ }
+
+ /* if the url it's not a file drop a dialog to recurse into the url */
+@@ -728,6 +733,7 @@
+ downloads = g_list_append(downloads,gwgetdata);
+ new_download(gwgetdata);
+ gwget_data_set_state(gwgetdata,DL_NOT_CONNECTED);
++ return TRUE;
+ }
+
+ void
+diff -Naur gwget-1.0.4.orig/src/gwget_data.h gwget-1.0.4/src/gwget_data.h
+--- gwget-1.0.4.orig/src/gwget_data.h 2009-06-16 19:58:06.000000000 +0200
++++ gwget-1.0.4/src/gwget_data.h 2018-01-19 11:10:17.784148648 +0100
+@@ -126,7 +126,7 @@
+ void gwget_data_free(gpointer data);
+ void gwget_data_stop_download(GwgetData *data);
+ void gwget_data_set_filename_from_url(GwgetData *gwgetdata, gchar *url);
+-void gwget_data_add_download(GwgetData *gwgetdata);
++gboolean gwget_data_add_download(GwgetData *gwgetdata);
+ void gwget_data_exec(GwgetData *gwgetdata);
+ void gwget_data_set_menus (GwgetData *gwgetdata);
+ void gwget_data_set_popupmenu (GwgetData *gwgetdata);
+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 2018-01-19 11:03:01.897778000 +0100
++++ gwget-1.0.4/src/main.c 2018-01-19 11:11:27.529567168 +0100
+@@ -194,8 +194,9 @@
+ if (destination_dir) {
+ gwgetdata->dir = destination_dir;
+ }
+- gwget_data_add_download(gwgetdata);
+- gwget_data_start_download(gwgetdata);
++ if (gwget_data_add_download(gwgetdata)) {
++ gwget_data_start_download(gwgetdata);
++ }
+ g_object_unref (file);
+ }
+ }
+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 2018-01-19 11:03:01.911112000 +0100
++++ gwget-1.0.4/src/new_window.c 2018-01-19 11:30:04.102904944 +0100
+@@ -58,22 +58,14 @@
+
+ if (strcmp(url,"")) {
+ save_in=g_strdup(gtk_entry_get_text (GTK_ENTRY(save_in_entry)));
+-
+- if (!strcmp(save_in,"") && gwget_pref.download_dir) {
+- save_in=g_strdup(gwget_pref.download_dir);
+- }
+-
+- if (!strcmp(save_in,"") && !gwget_pref.download_dir) {
+- save_in=g_strdup(g_get_home_dir());
+- }
+-
+ save_in_list = g_strdup(save_in);
+ if (g_list_find_custom(save_in_paths, save_in, (GCompareFunc) strcmp)==NULL) {
+ save_in_paths = g_list_prepend (save_in_paths, save_in_list);
+ }
+ gwgetdata = gwget_data_create (url, save_in);
+- gwget_data_add_download(gwgetdata);
+- gwget_data_start_download(gwgetdata);
++ if (gwget_data_add_download(gwgetdata)) {
++ gwget_data_start_download(gwgetdata);
++ }
+ gtk_widget_hide(window);
+ g_free(save_in);
+ }
Deleted: wget.patch
===================================================================
--- wget.patch 2018-01-19 11:13:57 UTC (rev 284164)
+++ wget.patch 2018-01-19 11:14:10 UTC (rev 284165)
@@ -1,13 +0,0 @@
-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 2014-12-19 00:00:13.499719000 +0100
-+++ gwget-1.0.4/src/wget-log.c 2014-12-19 01:30:44.848448393 +0100
-@@ -152,6 +152,9 @@
- (strstr (gwgetdata->line, "Host not found.") == NULL) &&
- (strstr (gwgetdata->line, "Name or service not known") == NULL))
- break;
-+
-+ if (strncmp (gwgetdata->line, "converted ", 10) == 0)
-+ break;
-
- /* Wget, under certain circumstances, returns a list of resolved IP addresses
- * before attempting to connect, which can be ignored.
Copied: gwget/repos/community-x86_64/wget.patch (from rev 284163, gwget/trunk/wget.patch)
===================================================================
--- wget.patch (rev 0)
+++ wget.patch 2018-01-19 11:14:10 UTC (rev 284165)
@@ -0,0 +1,13 @@
+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 2014-12-19 00:00:13.499719000 +0100
++++ gwget-1.0.4/src/wget-log.c 2014-12-19 01:30:44.848448393 +0100
+@@ -152,6 +152,9 @@
+ (strstr (gwgetdata->line, "Host not found.") == NULL) &&
+ (strstr (gwgetdata->line, "Name or service not known") == NULL))
+ break;
++
++ if (strncmp (gwgetdata->line, "converted ", 10) == 0)
++ break;
+
+ /* Wget, under certain circumstances, returns a list of resolved IP addresses
+ * before attempting to connect, which can be ignored.
More information about the arch-commits
mailing list