Re: [evolution-patches] Patch submission

[riyaz ahmed <sunez riyaz gmail com>]

On 7/13/05, Jeffrey Stedfast <fejj novell com> wrote:

it would be nice if you made a single diff and added the changelog
entries to the proper changelog file.

If you used emacs, it would auto-magically find the proper ChangeLog
file for you and properly add the filename to the ChangeLog

eg, the ChangeLog entry should look more like this:

2005-07-13  H.A.Riyaz Ahmed  <sunez riyaz gmail com>

        Fixes bug #246244 and bug #246247

        * src/menubar.c (function_modified): changed the value of the argument

        * src/propeties.c (function_modified): added the condition statement

        * src/body.c (function_modified): changed the argument as required

        * src/utils.c (function_modified): changed the display as mentioned


(Note: I'm assuming the files are in gtkhtml/src/ but that might not be
the case)

that said... you should also be a tad more descriptive in the changelog.
For example, body.c's change says "changed the argument as required".
That doesn't at all describe what you changed. Instead, a better
description might be:

"changed the capitalisation of some words to conform to the HIG"

your changes to properties.c does not follow the coding style. Please
read the README.HACKING file and keep your coding style consistant with
the surrounding code.

also... why are there multiple patches to the same files? which diff is
the one we should be reviewing?


I suggest you make the following changes above (using `cvs diff -up`
would be extremely useful as well) and then resend the single resulting
patch.

   Hi ....
I have remodified the patch as you have mentioned
ithink that this will be fine
 Truly
 H.A.Riyaz Ahmed

Jeff

On Wed, 2005-07-13 at 17:49 +0530, riyaz ahmed wrote:
> hi,
>
>    i have attached the patches for  the bugs 246244( three files ) ,
> 246247( three files ) and a
> changelog file
> these fixes the label and HIG-layout suggestions ,
>
>
> Truly
> H.A.Riyaz Ahmed
> _______________________________________________
> evolution-patches mailing list
> evolution-patches lists ximian com
> http://lists.ximian.com/mailman/listinfo/evolution-patches
--
Jeffrey Stedfast
Evolution Hacker - Novell, Inc.
fejj ximian com  - www.novell.com

--- body.c	2005-07-10 10:00:01.000000000 +0530
+++ body1.c	2005-07-13 09:14:01.000000000 +0530
@@ -68,7 +68,7 @@ static BodyTemplate body_templates [TEMP
 		10,
 	},
 	{
-		N_("Perforated paper"),
+		N_("Perforated Paper"),
 		ICONDIR "/paper.png",
 		{0, 0xffff, 0xffff, 0xffff},
 		{0, 0, 0, 0},
@@ -76,7 +76,7 @@ static BodyTemplate body_templates [TEMP
 		30,
 	},
 	{
-		N_("Blue ink"),
+		N_("Blue Ink"),
 		ICONDIR "/texture.png",
 		{0, 0xffff, 0xffff, 0xffff},
 		{0, 0x1fff, 0x1fff, 0x8fff},
--- menubar.c	2005-07-13 08:34:24.000000000 +0530
+++ menubar1.c	2005-07-13 09:14:01.000000000 +0530
@@ -355,11 +355,11 @@ format_page_cb (BonoboUIComponent *uic, 
 	if (cd->properties_dialog)
 		gtk_html_edit_properties_dialog_close (cd->properties_dialog);
 
-	cd->properties_dialog = gtk_html_edit_properties_dialog_new (cd, _("Format Page"),
+	cd->properties_dialog = gtk_html_edit_properties_dialog_new (cd, _("Properties"),
 								     gnome_icon_theme_lookup_icon (cd->icon_theme, "stock_properties", 16, NULL, NULL));
 
 	gtk_html_edit_properties_dialog_add_entry (cd->properties_dialog,
-						   GTK_HTML_EDIT_PROPERTY_BODY,NULL,
+						   GTK_HTML_EDIT_PROPERTY_BODY, _("Page"),
 						   body_properties,
 						   body_close_cb);
 
--- properties.c	2005-07-13 08:35:59.000000000 +0530
+++ properties1.c	2005-07-13 09:14:01.000000000 +0530
@@ -66,10 +66,7 @@ switch_page (GtkWidget *w, GtkNotebookPa
 		pd = (PageData *) g_list_nth (d->page_data, num)->data;
 		if (pd) {
 			gchar *title;
-		if(g_strcasecmp(d->title,"Format Page"))
- 			title = g_strconcat (d->title, ": ", pd->name, NULL);
-			else
-			title = g_strconcat (d->title, " ", pd->name, NULL);
+			title = g_strconcat (d->title, ": ", pd->name, NULL);
 			gtk_window_set_title (GTK_WINDOW (d->dialog), title);
 			g_free (title);
 		}

--- menubar.c	2005-07-13 09:00:45.000000000 +0530
+++ menubar1.c	2005-07-13 09:14:01.000000000 +0530
@@ -134,10 +134,10 @@ insert_link_cb (BonoboUIComponent *uic, 
 	if (cd->properties_dialog)
 		gtk_html_edit_properties_dialog_close (cd->properties_dialog);
 
-	cd->properties_dialog = gtk_html_edit_properties_dialog_new (cd, _("Insert Link"), ICONDIR "/insert-link-24.png");
+	cd->properties_dialog = gtk_html_edit_properties_dialog_new (cd, _("Insert"), ICONDIR "/insert-link-24.png");
 
 	gtk_html_edit_properties_dialog_add_entry (cd->properties_dialog,
-						   GTK_HTML_EDIT_PROPERTY_LINK, NULL,
+						   GTK_HTML_EDIT_PROPERTY_LINK, _("Link"),
 						   link_insert,
 						   link_close_cb);
 
--- utils.c	2005-07-13 14:42:41.000000000 +0530
+++ utils1.c	2005-07-13 14:42:13.000000000 +0530
@@ -193,7 +193,7 @@ editor_hig_attach_row (GtkWidget *table,
 static gboolean stock_test_url_added = FALSE;
 static GtkStockItem test_url_items [] =
 {
-	{ GTKHTML_STOCK_TEST_URL, N_("_Check URL ..."), 0, 0, GETTEXT_PACKAGE }
+	{ GTKHTML_STOCK_TEST_URL, N_("_Visit..."), 0, 0, GETTEXT_PACKAGE }
 };
 
 void
--- properties.c	2005-07-13 09:01:57.000000000 +0530
+++ properties1.c	2005-07-13 09:14:01.000000000 +0530
@@ -66,10 +66,7 @@ switch_page (GtkWidget *w, GtkNotebookPa
 		pd = (PageData *) g_list_nth (d->page_data, num)->data;
 		if (pd) {
 			gchar *title;
-			if(g_strcasecmp(d->title,"Insert Link"))
- 			title = g_strconcat (d->title, ": ", pd->name, NULL);
-			else
-			title = g_strconcat (d->title, " ", pd->name, NULL);
+			title = g_strconcat (d->title, ": ", pd->name, NULL);
 			gtk_window_set_title (GTK_WINDOW (d->dialog), title);
 			g_free (title);
 		}

--- ChangeLog	2005-07-16 12:12:18.000000000 +0530
+++ ChangeLog1	2005-07-16 12:30:58.000000000 +0530
@@ -1,3 +1,15 @@
+2005-07-16  H.A.Riyaz Ahmed  <sunez riyaz gmail com>
+
+       Fixes bug #246244 and bug #246247
+
+       * src/menubar.c (function_modified): changed the titlebar name as mentioned in HIG
+
+       * src/properties.c (function_modified): added the condition statement
+
+       * src/body.c (function_modified): changed the capitalisation of some words to conform to the HIG
+
+       * src/utils.c (function_modified): changed the caption for the command button as mentioned in the HIG
+
 
 2005-07-11  Kaushal Kumar  <kakumar novell com>