From abe8db1c03a35ad7958b11e24aa13e6056a77e63 Mon Sep 17 00:00:00 2001 From: jhs Date: Mon, 12 Nov 2007 00:27:22 +0000 Subject: [PATCH] 2007-11-12 Johannes Schmid MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit * plugins/document-manager/plugin.c: (create_highlight_submenu): Bug 493583 – crash in Anjuta IDE: trying to open a file * plugins/subversion/subversion-commit-dialog.c: (select_all_files), (subversion_commit_dialog): Patch from jrligget - see #457477 git-svn-id: http://svn.gnome.org/svn/anjuta/trunk@3295 1dbfb86a-d425-0410-a06b-cb591aac69f6 --- ChangeLog | 9 +++++++++ plugins/document-manager/plugin.c | 20 ++++++++++++-------- plugins/subversion/subversion-commit-dialog.c | 11 +++++++++++ 3 files changed, 32 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 01762b6f..f0ab5a36 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,14 @@ 2007-11-12 Johannes Schmid + * plugins/document-manager/plugin.c: (create_highlight_submenu): + Bug 493583 – crash in Anjuta IDE: trying to open a file + + * plugins/subversion/subversion-commit-dialog.c: + (select_all_files), (subversion_commit_dialog): + Patch from jrligget - see #457477 + +2007-11-12 Johannes Schmid + Patch from Marc Lorber : * libanjuta/anjuta-plugin-handle.c: (anjuta_plugin_handle_get_about): diff --git a/plugins/document-manager/plugin.c b/plugins/document-manager/plugin.c index f6e77acc..afa6a1da 100644 --- a/plugins/document-manager/plugin.c +++ b/plugins/document-manager/plugin.c @@ -1008,14 +1008,18 @@ create_highlight_submenu (DocmanPlugin *plugin, IAnjutaEditor *editor) const gchar *lang = node->data; const gchar *name = ianjuta_editor_language_get_language_name (IANJUTA_EDITOR_LANGUAGE (editor), lang, NULL); - menuitem = gtk_menu_item_new_with_mnemonic (name); - g_object_set_data_full (G_OBJECT (menuitem), "language_code", - g_strdup (lang), - (GDestroyNotify)g_free); - g_signal_connect (G_OBJECT (menuitem), "activate", - G_CALLBACK (on_force_hilite_activate), - plugin); - gtk_menu_shell_append (GTK_MENU_SHELL (submenu), menuitem); + /* Should fix #493583 */ + if (name != NULL) + { + menuitem = gtk_menu_item_new_with_mnemonic (name); + g_object_set_data_full (G_OBJECT (menuitem), "language_code", + g_strdup (lang), + (GDestroyNotify)g_free); + g_signal_connect (G_OBJECT (menuitem), "activate", + G_CALLBACK (on_force_hilite_activate), + plugin); + gtk_menu_shell_append (GTK_MENU_SHELL (submenu), menuitem); + } node = g_list_next (node); } g_list_free(sorted_languages); diff --git a/plugins/subversion/subversion-commit-dialog.c b/plugins/subversion/subversion-commit-dialog.c index a29dda4a..d7f6bcf0 100644 --- a/plugins/subversion/subversion-commit-dialog.c +++ b/plugins/subversion/subversion-commit-dialog.c @@ -123,6 +123,13 @@ on_subversion_commit_response(GtkDialog* dialog, gint response, } static void +select_all_files (AnjutaCommand *command, guint return_code, + AnjutaVcsStatusTreeView *status_view) +{ + anjuta_vcs_status_tree_view_select_all (status_view); +} + +static void subversion_commit_dialog (GtkAction* action, Subversion* plugin, gchar *filename) { @@ -155,6 +162,10 @@ subversion_commit_dialog (GtkAction* action, Subversion* plugin, commit_status_view); g_signal_connect (G_OBJECT (status_command), "command-finished", + G_CALLBACK (select_all_files), + commit_status_view); + + g_signal_connect (G_OBJECT (status_command), "command-finished", G_CALLBACK (on_status_command_finished), NULL); -- 2.11.4.GIT