diff --git a/0001-Fix-warnings-activating-mDNS-bookmarks.patch b/0001-Fix-warnings-activating-mDNS-bookmarks.patch deleted file mode 100644 index 691fdd9..0000000 --- a/0001-Fix-warnings-activating-mDNS-bookmarks.patch +++ /dev/null @@ -1,36 +0,0 @@ -From c80f47981e6f9a3dec1c192d4906a1159ad947ee Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Fri, 18 Sep 2009 18:15:46 +0100 -Subject: [PATCH] Fix warnings activating mDNS bookmarks - -- Don't tell the marshallers that we have an object and pass a pointer -- Don't emit a signal when we don't have an object to pass ---- - vinagre/vinagre-fav.c | 8 +++++--- - 1 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/vinagre/vinagre-fav.c b/vinagre/vinagre-fav.c -index 490dd11..d94f81d 100644 ---- a/vinagre/vinagre-fav.c -+++ b/vinagre/vinagre-fav.c -@@ -139,7 +139,7 @@ vinagre_fav_class_init (VinagreFavClass *klass) - g_cclosure_marshal_VOID__OBJECT, - G_TYPE_NONE, - 1, -- G_TYPE_POINTER); -+ G_TYPE_OBJECT); - - signals[FAV_SELECTED] = - g_signal_new ("fav-selected", -@@ -150,7 +150,7 @@ vinagre_fav_class_init (VinagreFavClass *klass) - g_cclosure_marshal_VOID__OBJECT, - G_TYPE_NONE, - 1, -- G_TYPE_POINTER); -+ G_TYPE_OBJECT); - - g_type_class_add_private (object_class, sizeof (VinagreFavPrivate)); - } --- -1.6.2.5 - diff --git a/vinagre-history-crash.patch b/vinagre-history-crash.patch deleted file mode 100644 index 61b53e3..0000000 --- a/vinagre-history-crash.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up vinagre-2.28.1/vinagre/vinagre-connect.c.history-crash vinagre-2.28.1/vinagre/vinagre-connect.c ---- vinagre-2.28.1/vinagre/vinagre-connect.c.history-crash 2010-01-04 20:37:20.282194058 -0500 -+++ vinagre-2.28.1/vinagre/vinagre-connect.c 2010-01-04 20:37:29.269077172 -0500 -@@ -203,7 +203,7 @@ saved_history (void) - { - history_from_file = g_strsplit (file_contents, "\n", 0); - len = g_strv_length (history_from_file); -- if (strlen (history_from_file[len-1]) == 0) -+ if (len > 0 && strlen (history_from_file[len-1]) == 0) - { - g_free (history_from_file[len-1]); - history_from_file[len-1] = NULL; diff --git a/vinagre-prefs.patch b/vinagre-prefs.patch deleted file mode 100644 index f5b951e..0000000 --- a/vinagre-prefs.patch +++ /dev/null @@ -1,70 +0,0 @@ ---- vinagre-2.27.91/vinagre/vinagre-prefs.c 2009-07-30 16:13:29.000000000 -0400 -+++ hacked/vinagre/vinagre-prefs.c 2009-09-05 22:51:22.750568356 -0400 -@@ -152,41 +152,51 @@ - static void - vinagre_prefs_set_bool (VinagrePrefs *prefs, const gchar* key, gboolean value) - { -- g_return_if_fail (gconf_client_key_is_writable ( -- prefs->priv->gconf_client, key, NULL)); -+ GError *error = NULL; - -- gconf_client_set_bool (prefs->priv->gconf_client, key, value, NULL); -+ if (!gconf_client_set_bool (prefs->priv->gconf_client, key, value, &error)) -+ { -+ g_warning ("Setting key %s failed: %s", key, error->message); -+ g_error_free (error); -+ } - } - - static void - vinagre_prefs_set_int (VinagrePrefs *prefs, const gchar* key, gint value) - { -- g_return_if_fail (gconf_client_key_is_writable ( -- prefs->priv->gconf_client, key, NULL)); -+ GError *error = NULL; - -- gconf_client_set_int (prefs->priv->gconf_client, key, value, NULL); -+ if (!gconf_client_set_int (prefs->priv->gconf_client, key, value, &error)) -+ { -+ g_warning ("Setting key %s failed: %s", key, error->message); -+ g_error_free (error); -+ } - } - - static void - vinagre_prefs_set_string (VinagrePrefs *prefs, const gchar *key, const gchar *value) - { -- g_return_if_fail (gconf_client_key_is_writable ( -- prefs->priv->gconf_client, key, NULL)); -+ GError *error = NULL; - -- gconf_client_set_string (prefs->priv->gconf_client, key, value, NULL); -+ if (!gconf_client_set_string (prefs->priv->gconf_client, key, value, &error)) -+ { -+ g_warning ("Setting key %s failed: %s", key, error->message); -+ g_error_free (error); -+ } - } - - static void - vinagre_prefs_set_list (VinagrePrefs *prefs, const gchar* key, GSList *list) - { -- g_return_if_fail (gconf_client_key_is_writable ( -- prefs->priv->gconf_client, key, NULL)); -+ GError *error = NULL; - -- gconf_client_set_list (prefs->priv->gconf_client, -- key, -- GCONF_VALUE_STRING, -- list, -- NULL); -+ if (!gconf_client_set_list (prefs->priv->gconf_client, key, -+ GCONF_VALUE_STRING, list, -+ &error)) -+ { -+ g_warning ("Setting key %s failed: %s", key, error->message); -+ g_error_free (error); -+ } - } - - static void diff --git a/vinagre-unique-ids.patch b/vinagre-unique-ids.patch deleted file mode 100644 index d62af2f..0000000 --- a/vinagre-unique-ids.patch +++ /dev/null @@ -1,98 +0,0 @@ -diff --git a/data/vinagre.ui b/data/vinagre.ui -index 33c99ec..93e2560 100644 ---- a/data/vinagre.ui -+++ b/data/vinagre.ui -@@ -17,7 +17,7 @@ - vertical - 2 - -- -+ - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 -@@ -61,7 +61,7 @@ - - - -- -+ - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 -@@ -101,7 +101,7 @@ - - - -- -+ - True - 0 - _Protocol: -@@ -174,7 +174,7 @@ - - True - -- -+ - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - -@@ -540,7 +540,7 @@ - True - vertical - -- -+ - True - - -@@ -688,7 +688,7 @@ - - - -- -+ - True - - -@@ -703,7 +703,7 @@ - - - -- -+ - _Full screen - True - True -@@ -753,7 +753,7 @@ - - True - -- -+ - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - -@@ -862,7 +862,7 @@ - - - -- -+ - True - 12 - -diff --git a/vinagre/vinagre-bookmarks-ui.c b/vinagre/vinagre-bookmarks-ui.c -index 71fdbf6..441456f 100644 ---- a/vinagre/vinagre-bookmarks-ui.c -+++ b/vinagre/vinagre-bookmarks-ui.c -@@ -133,7 +133,7 @@ show_dialog_conn (VinagreBookmarks *book, - dialog = GTK_WIDGET (gtk_builder_get_object (xml, "bookmarks_add_edit_conn_dialog")); - name_entry = GTK_WIDGET (gtk_builder_get_object (xml, "edit_bookmark_name_entry")); - host_entry = GTK_WIDGET (gtk_builder_get_object (xml, "edit_bookmark_host_entry")); -- fs_check = GTK_WIDGET (gtk_builder_get_object (xml, "fullscreen_check")); -+ fs_check = GTK_WIDGET (gtk_builder_get_object (xml, "bookmark_fullscreen_check")); - folder_box = GTK_WIDGET (gtk_builder_get_object (xml, "folder_box")); - plugin_box = GTK_WIDGET (gtk_builder_get_object (xml, "plugin_options_vbox")); - save_button = GTK_WIDGET (gtk_builder_get_object (xml, "save_button")); diff --git a/vinagre.spec b/vinagre.spec index 7c597af..5051fa2 100644 --- a/vinagre.spec +++ b/vinagre.spec @@ -29,9 +29,6 @@ BuildRequires: scrollkeeper # for /usr/share/dbus-1/services Requires: dbus -# https://bugzilla.gnome.org/show_bug.cgi?id=606072 -Patch0: vinagre-history-crash.patch - %description Vinagre is a VNC client for the GNOME desktop. @@ -55,7 +52,6 @@ to vinagre. %prep %setup -q -%patch0 -p1 -b .history-crash %build %configure --enable-avahi=yes --disable-static