From 8f5d78b5757f68d5f2ed5aee9017996f0d365062 Mon Sep 17 00:00:00 2001 From: marcus Date: Sat, 24 Jan 2004 07:48:29 +0000 Subject: Fix a crash when trying to launch gnome-file-types-capplet with an unknown MIME type argument. Reported by: Simon Barner Obtained from: GNOME CVS git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1710 df743ca5-7f9a-e211-a948-0013205c9059 --- sysutils/gnome-control-center/Makefile | 1 + .../files/patch-capplets_file-types_mime-edit-dialog.c | 15 +++++++++++++++ sysutils/gnomecontrolcenter2/Makefile | 1 + .../files/patch-capplets_file-types_mime-edit-dialog.c | 15 +++++++++++++++ 4 files changed, 32 insertions(+) create mode 100644 sysutils/gnome-control-center/files/patch-capplets_file-types_mime-edit-dialog.c create mode 100644 sysutils/gnomecontrolcenter2/files/patch-capplets_file-types_mime-edit-dialog.c (limited to 'sysutils') diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile index 8d3a33c46..77ce2e501 100644 --- a/sysutils/gnome-control-center/Makefile +++ b/sysutils/gnome-control-center/Makefile @@ -7,6 +7,7 @@ PORTNAME= gnomecontrolcenter2 PORTVERSION= 2.5.2 +PORTREVISION= 1 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/control-center/2.5 diff --git a/sysutils/gnome-control-center/files/patch-capplets_file-types_mime-edit-dialog.c b/sysutils/gnome-control-center/files/patch-capplets_file-types_mime-edit-dialog.c new file mode 100644 index 000000000..dd8279ca3 --- /dev/null +++ b/sysutils/gnome-control-center/files/patch-capplets_file-types_mime-edit-dialog.c @@ -0,0 +1,15 @@ +--- capplets/file-types/mime-edit-dialog.c.orig Sat Jan 24 02:41:49 2004 ++++ capplets/file-types/mime-edit-dialog.c Sat Jan 24 02:42:26 2004 +@@ -406,11 +406,8 @@ + char const *file_name) + { + GObject *dialog = g_object_new (mime_edit_dialog_get_type (), +- "model", model, /* must be before is-add */ ++ "model", model, "is-add", TRUE, /* model must be before is-add */ + NULL); +- g_object_set (dialog, +- "is-add", TRUE, +- NULL); + if (parent != NULL) + gtk_window_set_transient_for ( + GTK_WINDOW (MIME_EDIT_DIALOG (dialog)->p->dialog_win), diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile index 8d3a33c46..77ce2e501 100644 --- a/sysutils/gnomecontrolcenter2/Makefile +++ b/sysutils/gnomecontrolcenter2/Makefile @@ -7,6 +7,7 @@ PORTNAME= gnomecontrolcenter2 PORTVERSION= 2.5.2 +PORTREVISION= 1 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/control-center/2.5 diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets_file-types_mime-edit-dialog.c b/sysutils/gnomecontrolcenter2/files/patch-capplets_file-types_mime-edit-dialog.c new file mode 100644 index 000000000..dd8279ca3 --- /dev/null +++ b/sysutils/gnomecontrolcenter2/files/patch-capplets_file-types_mime-edit-dialog.c @@ -0,0 +1,15 @@ +--- capplets/file-types/mime-edit-dialog.c.orig Sat Jan 24 02:41:49 2004 ++++ capplets/file-types/mime-edit-dialog.c Sat Jan 24 02:42:26 2004 +@@ -406,11 +406,8 @@ + char const *file_name) + { + GObject *dialog = g_object_new (mime_edit_dialog_get_type (), +- "model", model, /* must be before is-add */ ++ "model", model, "is-add", TRUE, /* model must be before is-add */ + NULL); +- g_object_set (dialog, +- "is-add", TRUE, +- NULL); + if (parent != NULL) + gtk_window_set_transient_for ( + GTK_WINDOW (MIME_EDIT_DIALOG (dialog)->p->dialog_win), -- cgit v1.2.3