SF.net SVN: geany-plugins:[608] trunk/geanysendmail

[frlan at users.sourceforge.net]

Revision: 608
          http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=608&view=rev
Author:   frlan
Date:     2009-04-24 19:46:16 +0000 (Fri, 24 Apr 2009)

Log Message:
-----------
GeanySendMail: Applied a patch by Timothy Boronczyk which allows aborting when inserting recipient's email address.

Modified Paths:
--------------
    trunk/geanysendmail/ChangeLog
    trunk/geanysendmail/src/geanysendmail.c

Modified: trunk/geanysendmail/ChangeLog
===================================================================
--- trunk/geanysendmail/ChangeLog	2009-04-21 21:18:25 UTC (rev 607)
+++ trunk/geanysendmail/ChangeLog	2009-04-24 19:46:16 UTC (rev 608)
@@ -1,3 +1,9 @@
+2009-04-24  Frank Lanitz  <frank(at)frank(dot)uvena(dot)de>
+
+ * Applied a patch by Timothy Boronczyk which allows aborting when inserting
+   recipient's email address.
+
+
 2008-10-14  Frank Lanitz  <frank(at)frank(dot)uvena(dot)de>
 
  * Applied a patch by Nick to make use of Geany Plugin API r100 and the

Modified: trunk/geanysendmail/src/geanysendmail.c
===================================================================
--- trunk/geanysendmail/src/geanysendmail.c	2009-04-21 21:18:25 UTC (rev 607)
+++ trunk/geanysendmail/src/geanysendmail.c	2009-04-24 19:46:16 UTC (rev 608)
@@ -4,7 +4,7 @@
  *      Copyright 2007-2009 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
  *      Copyright 2007 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
  *      Copyright 2007, 2008 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
- *      Copyright 2008 Timothy Boronczyk <tboronczyk(at)gmail(dot)com>
+ *      Copyright 2008, 2009 Timothy Boronczyk <tboronczyk(at)gmail(dot)com>
  *
  *      This program is free software; you can redistribute it and/or modify
  *      it under the terms of the GNU General Public License as published by
@@ -104,9 +104,13 @@
 			{
 				gint tmp;
 
- 				dialog = gtk_dialog_new_with_buttons(_("Recipient's Address"),
- 					GTK_WINDOW(geany->main_widgets->window), GTK_DIALOG_DESTROY_WITH_PARENT,
- 					GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL);
+				dialog = gtk_dialog_new_with_buttons(_("Recipient's Address"),
+										GTK_WINDOW(geany->main_widgets->window),
+										GTK_DIALOG_DESTROY_WITH_PARENT,
+										GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+										GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
+										NULL);
+				gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT);
  				vbox = ui_dialog_vbox_new(GTK_DIALOG(dialog));
  				gtk_widget_set_name(dialog, "GeanyDialog");
  				gtk_box_set_spacing(GTK_BOX(vbox), 10);
@@ -125,8 +129,13 @@
 
  				tmp = gtk_dialog_run(GTK_DIALOG(dialog));
 
- 				if (tmp == GTK_RESPONSE_ACCEPT)
- 				{
+				if (tmp != GTK_RESPONSE_ACCEPT)
+				{
+					gtk_widget_destroy(dialog);
+					return;
+				}
+				else
+				{
 					g_key_file_load_from_file(config, config_file, G_KEY_FILE_NONE, NULL);
 
 					g_free(address);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.