1 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
4 * Copyright (C) James Liggett 2010 <jrliggett@cox.net>
6 * git-shell-test is free software: you can redistribute it and/or modify it
7 * under the terms of the GNU General Public License as published by the
8 * Free Software Foundation, either version 3 of the License, or
9 * (at your option) any later version.
11 * git-shell-test is distributed in the hope that it will be useful, but
12 * WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
14 * See the GNU General Public License for more details.
16 * You should have received a copy of the GNU General Public License along
17 * with this program. If not, see <http://www.gnu.org/licenses/>.
20 #include "git-resolve-conflicts-pane.h"
23 on_resolve_conflicts_button_clicked (GtkAction
*action
, Git
*plugin
)
26 GitAddCommand
*add_command
;
28 paths
= git_status_pane_get_all_selected_items (GIT_STATUS_PANE (plugin
->status_pane
),
29 ANJUTA_VCS_STATUS_CONFLICTED
);
33 add_command
= git_add_command_new_list (plugin
->project_root_directory
,
36 anjuta_util_glist_strings_free (paths
);
38 g_signal_connect (G_OBJECT (add_command
), "command-finished",
39 G_CALLBACK (git_pane_report_errors
),
43 g_signal_connect (G_OBJECT (add_command
), "command-finished",
44 G_CALLBACK (g_object_unref
),
47 anjuta_command_start (ANJUTA_COMMAND (add_command
));
50 anjuta_util_dialog_error (NULL
, _("No conflicted files selected."));