diff options
Diffstat (limited to 'community/gwget/drop-libgnomeui.patch')
| -rw-r--r-- | community/gwget/drop-libgnomeui.patch | 257 |
1 files changed, 257 insertions, 0 deletions
diff --git a/community/gwget/drop-libgnomeui.patch b/community/gwget/drop-libgnomeui.patch new file mode 100644 index 000000000..30a121f25 --- /dev/null +++ b/community/gwget/drop-libgnomeui.patch @@ -0,0 +1,257 @@ +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 +@@ -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 2012-03-10 01:09:09.260201828 +0100 +@@ -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 2012-03-10 01:09:09.263534966 +0100 +@@ -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 2012-03-10 01:09:09.273534378 +0100 +@@ -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 2012-03-10 01:09:09.276867514 +0100 +@@ -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> +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 +@@ -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,7 +220,10 @@ + gchar *size; + int width = 16, height = 16; + gdouble perc; +- ++ GThemedIcon *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); + gtk_list_store_set (GTK_LIST_STORE(model), &iter,URL_COLUMN,gwgetdata->url, +@@ -243,10 +249,15 @@ + 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); +- } else { + gwgetdata->icon_name = g_strdup("gtk-refresh"); ++ icon = (GThemedIcon*) g_content_type_get_icon (content_type); ++ icon_names = g_themed_icon_get_names (icon); ++ for (i=0; i<sizeof(icon_names)-1; i++) { ++ if (gtk_icon_theme_has_icon (gtk_icon_theme_get_default (), icon_names[i])) { ++ gwgetdata->icon_name = icon_names[i]; ++ break; ++ } ++ } + } + gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &width, &height); + 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 +@@ -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 2009-08-14 19:19:51.000000000 +0200 ++++ gwget-1.0.4/src/systray.c 2012-03-10 01:09:09.290200060 +0100 +@@ -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 2012-03-10 01:09:09.296866335 +0100 +@@ -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 2012-03-10 01:09:09.306865743 +0100 +@@ -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> |