1 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
4 * Copyright (C) James Liggett 2010 <jrliggett@cox.net>
6 * anjuta 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 * anjuta 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 #ifndef _GIT_MERGE_PANE_H_
21 #define _GIT_MERGE_PANE_H_
23 #include <glib-object.h>
24 #include <libanjuta/anjuta-column-text-view.h>
26 #include "git-merge-command.h"
27 #include "git-branches-pane.h"
31 #define GIT_TYPE_MERGE_PANE (git_merge_pane_get_type ())
32 #define GIT_MERGE_PANE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIT_TYPE_MERGE_PANE, GitMergePane))
33 #define GIT_MERGE_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIT_TYPE_MERGE_PANE, GitMergePaneClass))
34 #define GIT_IS_MERGE_PANE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIT_TYPE_MERGE_PANE))
35 #define GIT_IS_MERGE_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIT_TYPE_MERGE_PANE))
36 #define GIT_MERGE_PANE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIT_TYPE_MERGE_PANE, GitMergePaneClass))
38 typedef struct _GitMergePaneClass GitMergePaneClass
;
39 typedef struct _GitMergePane GitMergePane
;
40 typedef struct _GitMergePanePriv GitMergePanePriv
;
42 struct _GitMergePaneClass
44 GitPaneClass parent_class
;
49 GitPane parent_instance
;
51 GitMergePanePriv
*priv
;
54 GType
git_merge_pane_get_type (void) G_GNUC_CONST
;
55 AnjutaDockPane
*git_merge_pane_new (Git
*plugin
);
56 AnjutaDockPane
*git_merge_pane_new_with_revision (Git
*plugin
,
57 const gchar
*revision
);
59 void on_merge_button_clicked (GtkAction
*action
, Git
*plugin
);
60 void on_git_branch_merge_activated (GtkAction
*action
, Git
*plugin
);
64 #endif /* _GIT_MERGE_PANE_H_ */