diff options
Diffstat (limited to 'security/gnomekeyringmanager/files')
6 files changed, 68 insertions, 62 deletions
diff --git a/security/gnomekeyringmanager/files/patch-src::gnome-keyring-manager-keyring-manager.c b/security/gnomekeyringmanager/files/patch-src::gnome-keyring-manager-keyring-manager.c deleted file mode 100644 index 763ead9f9ebe..000000000000 --- a/security/gnomekeyringmanager/files/patch-src::gnome-keyring-manager-keyring-manager.c +++ /dev/null @@ -1,30 +0,0 @@ ---- src/gnome-keyring-manager-keyring-manager.c.orig Mon Jul 12 23:14:24 2004 -+++ src/gnome-keyring-manager-keyring-manager.c Mon Jul 12 23:15:32 2004 -@@ -240,6 +240,13 @@ - GtkWidget *menubar; - GtkWidget *menu_item; - GError *error; -+ SetColumnPrefsData toggle[] = -+ { -+ { COLUMN_LOCK_ON_IDLE, "ToggleLockOnIdle", "lock-on-idle" }, -+ { COLUMN_LOCK_TIMEOUT, "ToggleLockTimeout", "lock-timeout" }, -+ { COLUMN_MTIME, "ToggleModificationTime", "mtime" }, -+ { COLUMN_CTIME, "ToggleCreationTime", "ctime" } -+ }; - - manager->priv = g_new0 (GKMKeyringManagerPrivate, 1); - -@@ -329,13 +336,6 @@ - g_signal_connect (manager->priv->tree_view, "button-press-event", G_CALLBACK (keyring_tree_button_press_callback), manager); - g_signal_connect (manager->priv->tree_view, "popup-menu", G_CALLBACK (keyring_tree_context_menu_callback), manager); - -- SetColumnPrefsData toggle[] = -- { -- { COLUMN_LOCK_ON_IDLE, "ToggleLockOnIdle", "lock-on-idle" }, -- { COLUMN_LOCK_TIMEOUT, "ToggleLockTimeout", "lock-timeout" }, -- { COLUMN_MTIME, "ToggleModificationTime", "mtime" }, -- { COLUMN_CTIME, "ToggleCreationTime", "ctime" } -- }; - manager->priv->gconf_cnxn_ids = - set_column_visibility_preferences (toggle, - G_N_ELEMENTS (toggle), diff --git a/security/gnomekeyringmanager/files/patch-src::gnome-keyring-manager-util.c b/security/gnomekeyringmanager/files/patch-src::gnome-keyring-manager-util.c deleted file mode 100644 index 946f458084d7..000000000000 --- a/security/gnomekeyringmanager/files/patch-src::gnome-keyring-manager-util.c +++ /dev/null @@ -1,20 +0,0 @@ ---- src/gnome-keyring-manager-util.c.orig Mon Jul 12 23:12:27 2004 -+++ src/gnome-keyring-manager-util.c Mon Jul 12 23:13:00 2004 -@@ -189,8 +189,6 @@ - GtkIconTheme *icon_theme; - GdkPixbuf *pixbuf; - -- g_return_val_if_fail (GTK_IS_WINDOW (transient_parent), NULL); -- - const char *authors[] = { - "Fernando Herrera <fherrera@onirica.com>", - "Mariano Su\303\241rez-Alvarez <mariano@gnome.org>", -@@ -201,6 +199,8 @@ - }; - const char *translator_credits = _("translator_credits"); - -+ g_return_val_if_fail (GTK_IS_WINDOW (transient_parent), NULL); -+ - icon_theme = gtk_icon_theme_get_default (); - pixbuf = gtk_icon_theme_load_icon (icon_theme, "stock_keyring", 48, 0, NULL); - diff --git a/security/gnomekeyringmanager/files/patch-src::gnome-keyring-manager.c b/security/gnomekeyringmanager/files/patch-src::gnome-keyring-manager.c deleted file mode 100644 index cfb78173e594..000000000000 --- a/security/gnomekeyringmanager/files/patch-src::gnome-keyring-manager.c +++ /dev/null @@ -1,12 +0,0 @@ ---- src/gnome-keyring-manager.c.orig Sun Jun 13 22:16:43 2004 -+++ src/gnome-keyring-manager.c Thu Dec 16 22:58:42 2004 -@@ -312,7 +312,8 @@ - { "manager", 'm', POPT_ARG_NONE, NULL, OPTION_MANAGER, - N_("Open the keyring manager"), NULL }, - { "keyring", 'k', POPT_ARG_STRING, NULL, OPTION_KEYRING, -- N_("Open the keyring editor for KEYRING"), N_("KEYRING") } -+ N_("Open the keyring editor for KEYRING"), N_("KEYRING") }, -+ { NULL, '\0', 0, NULL, 0, NULL, NULL } - }; - - int diff --git a/security/gnomekeyringmanager/files/patch-src_gnome-keyring-manager-acl-display.c b/security/gnomekeyringmanager/files/patch-src_gnome-keyring-manager-acl-display.c new file mode 100644 index 000000000000..3df8081babdb --- /dev/null +++ b/security/gnomekeyringmanager/files/patch-src_gnome-keyring-manager-acl-display.c @@ -0,0 +1,19 @@ +--- src/gnome-keyring-manager-acl-display.c.orig Sat Jul 2 02:12:49 2005 ++++ src/gnome-keyring-manager-acl-display.c Sat Jul 2 02:16:31 2005 +@@ -393,13 +393,15 @@ gkm_acl_display_set_acl (GKMAclDisplay * + GnomeKeyringAccessType at; + GtkTreeIter iter; + char *name, *path; ++ const char *app_path; + + ac = (GnomeKeyringAccessControl*) tmp->data; + name = gnome_keyring_item_ac_get_display_name (ac); + path = gnome_keyring_item_ac_get_path_name (ac); ++ app_path = gkm_get_application_path (); + + /* We don't want to include ourself in the list. */ +- if (g_str_equal (path, gkm_get_application_path ())) ++ if (app_path && g_str_equal (path, app_path)) + { + self->priv->gkm_ac = gnome_keyring_access_control_copy (ac); + } diff --git a/security/gnomekeyringmanager/files/patch-src_gnome-keyring-manager-main-ui.c b/security/gnomekeyringmanager/files/patch-src_gnome-keyring-manager-main-ui.c new file mode 100644 index 000000000000..81a4de59585d --- /dev/null +++ b/security/gnomekeyringmanager/files/patch-src_gnome-keyring-manager-main-ui.c @@ -0,0 +1,18 @@ +--- src/gnome-keyring-manager-main-ui.c.orig Fri Jun 10 19:59:37 2005 ++++ src/gnome-keyring-manager-main-ui.c Fri Jun 10 19:59:45 2005 +@@ -1100,6 +1100,7 @@ gkm_main_ui_initialize_menu (GKMMainUI * + { + GtkWidget *menubar; + GtkAccelGroup *accel_group; ++ GError *error = NULL; + + self->priv->action_group = gtk_action_group_new ("MenuActions"); + gtk_action_group_add_actions (self->priv->action_group, entries, +@@ -1111,7 +1112,6 @@ gkm_main_ui_initialize_menu (GKMMainUI * + self->priv->action_group, 0); + accel_group = gtk_ui_manager_get_accel_group (self->priv->ui_manager); + gtk_window_add_accel_group (GTK_WINDOW (self->priv->window), accel_group); +- GError *error = NULL; + if (!gtk_ui_manager_add_ui_from_file (self->priv->ui_manager, + GLADEDIR MENU_FILE, + &error)) diff --git a/security/gnomekeyringmanager/files/patch-src_gnome-keyring-manager-util.c b/security/gnomekeyringmanager/files/patch-src_gnome-keyring-manager-util.c new file mode 100644 index 000000000000..c05c11acf6e4 --- /dev/null +++ b/security/gnomekeyringmanager/files/patch-src_gnome-keyring-manager-util.c @@ -0,0 +1,31 @@ +--- src/gnome-keyring-manager-util.c.orig Wed May 18 16:41:35 2005 ++++ src/gnome-keyring-manager-util.c Sat Jul 2 02:12:38 2005 +@@ -304,8 +304,6 @@ gkm_about_dialog_new (GtkWindow *transie + { + GtkWidget *about; + +- g_return_val_if_fail (GTK_IS_WINDOW (transient_parent), NULL); +- + const char *authors[] = { + "Fernando Herrera <fherrera@onirica.com>", + "Mariano Su\303\241rez-Alvarez <mariano@gnome.org>", +@@ -317,6 +315,8 @@ gkm_about_dialog_new (GtkWindow *transie + NULL + }; + ++ g_return_val_if_fail (GTK_IS_WINDOW (transient_parent), NULL); ++ + gtk_about_dialog_set_email_hook ((GtkAboutDialogActivateLinkFunc) gkm_about_dialog_activate_links, + GINT_TO_POINTER (LINK_TYPE_EMAIL), NULL); + +@@ -354,6 +354,10 @@ gkm_get_application_path (void) + { + path = g_file_read_link ("/proc/self/exe", NULL); + } ++#elif defined(__FreeBSD__) ++ { ++ path = g_file_read_link ("/proc/curproc/file", NULL); ++ } + #endif + } + |