Branch: refs/heads/master Author: Thomas Martitz kugel@rockbox.org Committer: Nick Treleaven nick.treleaven@btinternet.com Date: Tue, 23 Sep 2014 13:43:47 UTC Commit: a6d11cb4f848ea6a9bb3d0fdf367e30fdb4694f1 https://github.com/geany/geany/commit/a6d11cb4f848ea6a9bb3d0fdf367e30fdb4694...

Log Message: ----------- Use custom document info bar response IDs

Modified Paths: -------------- src/document.c

Modified: src/document.c 19 lines changed, 13 insertions(+), 6 deletions(-) =================================================================== @@ -111,6 +111,13 @@ typedef struct * it contains the new value */ } undo_action;

+/* Custom document info bar response IDs */ +enum +{ + RESPONSE_DOCUMENT_RELOAD = 1, + RESPONSE_DOCUMENT_SAVE, +}; +

static guint doc_id_counter = 0;

@@ -3218,9 +3225,9 @@ static void on_monitor_reload_file_response(GtkWidget *bar, gint response_id, Ge unprotect_document(doc); doc->priv->info_bars[MSG_TYPE_RELOAD] = NULL;

- if (response_id == GTK_RESPONSE_REJECT) + if (response_id == RESPONSE_DOCUMENT_RELOAD) document_reload_file(doc, doc->encoding); - else if (response_id == GTK_RESPONSE_ACCEPT) + else if (response_id == RESPONSE_DOCUMENT_SAVE) document_save_file(doc, FALSE); }

@@ -3271,8 +3278,8 @@ static void monitor_reload_file(GeanyDocument *doc) GtkWidget *bar;

bar = document_show_message(doc, GTK_MESSAGE_QUESTION, on_monitor_reload_file_response, - _("_Reload"), GTK_RESPONSE_REJECT, - GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, + _("_Reload"), RESPONSE_DOCUMENT_RELOAD, + GTK_STOCK_SAVE, RESPONSE_DOCUMENT_SAVE, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, _("Do you want to reload it?"), _("The file '%s' on the disk is more recent than the current buffer."), @@ -3293,7 +3300,7 @@ static void on_monitor_resave_missing_file_response(GtkWidget *bar, { unprotect_document(doc);

- if (response_id == GTK_RESPONSE_ACCEPT) + if (response_id == RESPONSE_DOCUMENT_SAVE) dialogs_show_save_as();

doc->priv->info_bars[MSG_TYPE_RESAVE] = NULL; @@ -3311,7 +3318,7 @@ static void monitor_resave_missing_file(GeanyDocument *doc)

bar = document_show_message(doc, GTK_MESSAGE_WARNING, on_monitor_resave_missing_file_response, - GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, + GTK_STOCK_SAVE, RESPONSE_DOCUMENT_SAVE, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, NULL, GTK_RESPONSE_NONE, _("Try to resave the file?"),

-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).