← Back to branch summary

~ubuntu-branches/ubuntu/utopic/anjuta/utopic-proposed

« back to all changes in this revision

Viewing changes to plugins/git/git-apply-mailbox-pane.c

  • Committer: Package Import Robot
  • Author(s): Andreas Henriksson, Jackson Doak
  • Date: 2014-07-12 15:17:39 UTC
  • mfrom: (1.4.14)
  • Revision ID: package-import@ubuntu.com-20140712151739-p9xy0ntlgbpm2nxq
Tags: 2:3.12.0-1
* Team upload.

[ Jackson Doak ]
* New upstream release
* Drop 03_valac_0.22.patch, fixed upstream\
* debian/control:
  - Bump b-dep version on libgtk-3-dev (>= 3.6.0), libglib2.0-dev (>= 2.34.0)
  - Bump stardards-version to 3.9.5. No changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/git/git-apply-mailbox-pane.c
27
27
G_DEFINE_TYPE (GitApplyMailboxPane, git_apply_mailbox_pane, GIT_TYPE_PANE);
28
28
 
29
29
static void
30
 
on_ok_button_clicked (GtkButton *button, GitApplyMailboxPane *self)
 
30
on_ok_action_activated (GtkAction *action, GitApplyMailboxPane *self)
31
31
{
32
32
        Git *plugin;
33
33
        AnjutaFileList *mailbox_list;
34
 
        GtkToggleButton *signoff_check;
 
34
        GtkToggleAction *signoff_action;
35
35
        GList *paths;
36
36
        GitApplyMailboxCommand *apply_mailbox_command;
37
37
 
38
38
        plugin = ANJUTA_PLUGIN_GIT (anjuta_dock_pane_get_plugin (ANJUTA_DOCK_PANE (self)));
39
39
        mailbox_list = ANJUTA_FILE_LIST (gtk_builder_get_object (self->priv->builder,
40
40
                                                                 "mailbox_list"));
41
 
        signoff_check = GTK_TOGGLE_BUTTON (gtk_builder_get_object (self->priv->builder,
42
 
                                                                   "signoff_check"));
 
41
        signoff_action = GTK_TOGGLE_ACTION (gtk_builder_get_object (self->priv->builder,
 
42
                                                                   "signoff_action"));
43
43
        paths = anjuta_file_list_get_paths (mailbox_list);
44
44
 
45
45
        apply_mailbox_command = git_apply_mailbox_command_new (plugin->project_root_directory,
46
46
                                                               paths,
47
 
                                                               gtk_toggle_button_get_active (signoff_check));
 
47
                                                               gtk_toggle_action_get_active (signoff_action));
48
48
 
49
49
        git_pane_create_message_view (plugin);
50
50
 
73
73
git_apply_mailbox_pane_init (GitApplyMailboxPane *self)
74
74
{
75
75
        gchar *objects[] = {"apply_mailbox_pane",
 
76
                                                "ok_action",
 
77
                                                "cancel_action",
 
78
                                                "signoff_action",
76
79
                                                NULL};
77
80
        GError *error = NULL;
78
 
        GtkWidget *ok_button;
79
 
        GtkWidget *cancel_button;
80
 
        
 
81
        GtkAction *ok_action;
 
82
        GtkAction *cancel_action;
81
83
 
82
84
        self->priv = g_new0 (GitApplyMailboxPanePriv, 1);
83
85
        self->priv->builder = gtk_builder_new ();
90
92
                g_error_free (error);
91
93
        }
92
94
 
93
 
        ok_button = GTK_WIDGET (gtk_builder_get_object (self->priv->builder, 
94
 
                                                        "ok_button"));
95
 
        cancel_button = GTK_WIDGET (gtk_builder_get_object (self->priv->builder, 
96
 
                                                            "cancel_button"));
97
 
        
98
 
        g_signal_connect (G_OBJECT (ok_button), "clicked",
99
 
                          G_CALLBACK (on_ok_button_clicked),
 
95
        ok_action = GTK_ACTION (gtk_builder_get_object (self->priv->builder,
 
96
                                                        "ok_action"));
 
97
        cancel_action = GTK_ACTION (gtk_builder_get_object (self->priv->builder,
 
98
                                                        "cancel_action"));
 
99
 
 
100
        g_signal_connect (G_OBJECT (ok_action), "activate",
 
101
                          G_CALLBACK (on_ok_action_activated),
100
102
                          self);
101
103
 
102
 
        g_signal_connect_swapped (G_OBJECT (cancel_button), "clicked",
 
104
        g_signal_connect_swapped (G_OBJECT (cancel_action), "activate",
103
105
                                  G_CALLBACK (git_pane_remove_from_dock),
104
106
                                  self);
105
107
}