diff options
author | ahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-12-13 05:53:01 +0800 |
---|---|---|
committer | ahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-12-13 05:53:01 +0800 |
commit | 6190861e69077b0095bdd8ac2d1f917063a08918 (patch) | |
tree | d88abf43b2f17cc48974367151093fdf73ef6a0c /x11-toolkits/libgnomeui/files | |
parent | 591b0600fb729f8157d96879b2fdf5a0805c85cd (diff) | |
download | marcuscom-ports-6190861e69077b0095bdd8ac2d1f917063a08918.tar marcuscom-ports-6190861e69077b0095bdd8ac2d1f917063a08918.tar.gz marcuscom-ports-6190861e69077b0095bdd8ac2d1f917063a08918.tar.bz2 marcuscom-ports-6190861e69077b0095bdd8ac2d1f917063a08918.tar.lz marcuscom-ports-6190861e69077b0095bdd8ac2d1f917063a08918.tar.xz marcuscom-ports-6190861e69077b0095bdd8ac2d1f917063a08918.tar.zst marcuscom-ports-6190861e69077b0095bdd8ac2d1f917063a08918.zip |
- Update to 2.13.0
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@5262 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11-toolkits/libgnomeui/files')
9 files changed, 239 insertions, 0 deletions
diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-app-helper.c b/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-app-helper.c new file mode 100644 index 000000000..87c3856f1 --- /dev/null +++ b/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-app-helper.c @@ -0,0 +1,74 @@ +--- libgnomeui/gnome-app-helper.c.orig Sun Mar 20 20:46:17 2005 ++++ libgnomeui/gnome-app-helper.c Sun Mar 20 20:49:57 2005 +@@ -435,6 +435,8 @@ + new_setting = gconf_value_get_bool(value); + } + ++ GDK_THREADS_ENTER(); ++ + if (new_setting && (mi->image == NULL)) { + GtkWidget *pixmap; + GnomeUIPixmapType pixmap_type; +@@ -457,6 +459,8 @@ + } else if (!new_setting && (mi->image != NULL)) { + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mi), NULL); + } ++ ++ GDK_THREADS_LEAVE(); + } + + /* Note that this function is also used for toolbars, don't assume +@@ -1320,6 +1324,8 @@ + if (entry->value->type != GCONF_VALUE_BOOL) + return; + ++ GDK_THREADS_ENTER(); ++ + menu = GTK_WIDGET (user_data); + + if (gconf_value_get_bool (entry->value)) { +@@ -1329,6 +1335,7 @@ + + if (tearoff) { + /* Do nothing */ ++ GDK_THREADS_LEAVE(); + return; + } + +@@ -1345,6 +1352,7 @@ + + if (!tearoff) { + /* Do nothing */ ++ GDK_THREADS_LEAVE(); + return; + } + +@@ -1352,6 +1360,8 @@ + gtk_widget_destroy (tearoff); + g_object_set_data (G_OBJECT (menu), "gnome-app-tearoff", NULL); + } ++ ++ GDK_THREADS_LEAVE(); + } + + +@@ -2467,7 +2477,9 @@ + } + } + ++ GDK_THREADS_ENTER(); + gtk_toolbar_set_style(toolbar, style); ++ GDK_THREADS_LEAVE(); + } + + static void +@@ -2511,7 +2523,9 @@ + style = GTK_TOOLBAR_BOTH; + } + ++ GDK_THREADS_ENTER(); + gtk_toolbar_set_style(toolbar, style); ++ GDK_THREADS_LEAVE(); + } + + static void diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-app.c b/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-app.c new file mode 100644 index 000000000..aae4e39f8 --- /dev/null +++ b/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-app.c @@ -0,0 +1,12 @@ +--- libgnomeui/gnome-app.c.orig Sun Mar 20 20:51:20 2005 ++++ libgnomeui/gnome-app.c Sun Mar 20 20:52:01 2005 +@@ -269,7 +269,9 @@ + detachable = gconf_value_get_bool (entry->value); + + /* Update */ ++ GDK_THREADS_ENTER(); + bonobo_dock_item_set_locked (item, !detachable); ++ GDK_THREADS_LEAVE(); + } + } + diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-entry.c b/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-entry.c new file mode 100644 index 000000000..e83891c08 --- /dev/null +++ b/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-entry.c @@ -0,0 +1,25 @@ +--- libgnomeui/gnome-entry.c.orig Sun Mar 20 20:54:19 2005 ++++ libgnomeui/gnome-entry.c Sun Mar 20 20:54:20 2005 +@@ -419,6 +419,8 @@ + { + GnomeEntry *gentry; + ++ GDK_THREADS_ENTER(); ++ + gentry = GNOME_ENTRY (user_data); + + /* If we're getting a notification from saving our own +@@ -427,10 +429,13 @@ + if (gentry->_priv->saving_history) { + gentry->_priv->saving_history = FALSE; + ++ GDK_THREADS_LEAVE(); + return; + } + + gnome_entry_load_history (gentry); ++ ++ GDK_THREADS_LEAVE(); + } + + /* FIXME: Make this static */ diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-gconf-ui.c b/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-gconf-ui.c new file mode 100644 index 000000000..5713fbd49 --- /dev/null +++ b/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-gconf-ui.c @@ -0,0 +1,20 @@ +--- libgnomeui/gnome-gconf-ui.c.orig Sun Mar 20 20:38:41 2005 ++++ libgnomeui/gnome-gconf-ui.c Sun Mar 20 20:39:51 2005 +@@ -148,6 +148,8 @@ + g_return_val_if_fail(eid.client != NULL, FALSE); + g_return_val_if_fail(pending_errors != NULL, FALSE); + ++ GDK_THREADS_ENTER(); ++ + if (current_dialog == NULL) { + GtkWidget *dialog; + gboolean have_overridden = FALSE; +@@ -245,6 +247,8 @@ + + gtk_window_present (GTK_WINDOW (current_dialog)); + ++ GDK_THREADS_LEAVE(); ++ + return FALSE; + } + diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-ice.c b/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-ice.c new file mode 100644 index 000000000..160e5ad9b --- /dev/null +++ b/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-ice.c @@ -0,0 +1,20 @@ +--- libgnomeui/gnome-ice.c.orig Sun Mar 20 20:33:56 2005 ++++ libgnomeui/gnome-ice.c Sun Mar 20 20:34:21 2005 +@@ -54,6 +54,8 @@ + IceConn connection = (IceConn) data; + IceProcessMessagesStatus status; + ++ GDK_THREADS_ENTER(); ++ + status = IceProcessMessages (connection, NULL, NULL); + + if (status == IceProcessMessagesIOError) +@@ -73,6 +75,8 @@ + IceCloseConnection (connection); + } + } ++ ++ GDK_THREADS_LEAVE(); + + return TRUE; + } diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-icon-sel.c b/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-icon-sel.c new file mode 100644 index 000000000..d096e0818 --- /dev/null +++ b/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-icon-sel.c @@ -0,0 +1,20 @@ +--- libgnomeui/gnome-icon-sel.c.orig Sun Mar 20 20:40:05 2005 ++++ libgnomeui/gnome-icon-sel.c Sun Mar 20 20:42:24 2005 +@@ -353,6 +353,8 @@ + return FALSE; + } + ++ GDK_THREADS_ENTER(); ++ + append_an_icon (gis, list->data); + + g_free (list->data); +@@ -367,6 +369,8 @@ + (double)gis->_priv->load_i / gis->_priv->load_file_count); + + gis->_priv->load_i ++; ++ ++ GDK_THREADS_LEAVE(); + + return TRUE; + } diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-pixmap-entry.c b/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-pixmap-entry.c new file mode 100644 index 000000000..46fc0489b --- /dev/null +++ b/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-pixmap-entry.c @@ -0,0 +1,25 @@ +--- libgnomeui/gnome-pixmap-entry.c.orig Sun Mar 20 20:34:49 2005 ++++ libgnomeui/gnome-pixmap-entry.c Sun Mar 20 20:38:30 2005 +@@ -237,6 +237,8 @@ + { + GSList *li,*tmp; + ++ GDK_THREADS_ENTER(); ++ + tmp = changed_pentries; + changed_pentries = NULL; + if(tmp) { +@@ -244,9 +246,13 @@ + refresh_preview(li->data); + } + g_slist_free(tmp); ++ ++ GDK_THREADS_LEAVE(); + return TRUE; + } + change_timeout = 0; ++ ++ GDK_THREADS_LEAVE(); + + return FALSE; + } diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-ui-init.c b/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-ui-init.c new file mode 100644 index 000000000..a38f70052 --- /dev/null +++ b/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-ui-init.c @@ -0,0 +1,13 @@ +--- libgnomeui/gnome-ui-init.c.orig Sun Mar 20 20:56:32 2005 ++++ libgnomeui/gnome-ui-init.c Sun Mar 20 20:56:36 2005 +@@ -492,8 +492,10 @@ + gnome_gconf_get_bool ("/desktop/gnome/sound/event_sounds")); + + if (new_use_event_sounds && !use_event_sounds) { ++ GDK_THREADS_ENTER(); + initialize_gtk_signal_relay (); + initialize_gnome_signal_relay (); ++ GDK_THREADS_LEAVE(); + } + + use_event_sounds = new_use_event_sounds; diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-authentication-manager.c b/x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-authentication-manager.c new file mode 100644 index 000000000..99990e1b9 --- /dev/null +++ b/x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-authentication-manager.c @@ -0,0 +1,30 @@ +--- libgnomeui/gnome-authentication-manager.c.orig Mon Aug 1 03:34:03 2005 ++++ libgnomeui/gnome-authentication-manager.c Mon Aug 1 03:36:29 2005 +@@ -849,7 +849,11 @@ + info->response = response; + info->response_data = response_data; + ++ GDK_THREADS_ENTER (); ++ + present_question_dialog_nonblocking (info); ++ ++ GDK_THREADS_LEAVE (); + } + + static void /* GnomeVFSModuleCallback */ +@@ -870,11 +874,15 @@ + in_real = (GnomeVFSModuleCallbackQuestionIn *)in; + out_real = (GnomeVFSModuleCallbackQuestionOut *)out; + ++ GDK_THREADS_ENTER (); ++ + out_real->answer = -1; /* Set a default value */ + dialog = create_question_dialog (in_real->primary_message, in_real->secondary_message, in_real->choices); + out_real->answer = gtk_dialog_run (GTK_DIALOG(dialog)); + + gtk_widget_destroy (GTK_WIDGET (dialog)); ++ ++ GDK_THREADS_LEAVE (); + } + + |