updated fix for bug 319308 [addressbook]

Boby Wang <[email protected]>
Newsgroups gmane.comp.gnome.evolution.patches
Organization Sun China Engineering Research Institute
Message-ID <1140604251.2542.2.camel@sweeper>
Hi,
    I have attached an new patch for bug 319308. Removing sqare brackets
of folder name.
Sincerely.
Boby.

_______________________________________________
Evolution-patches mailing list
[email protected]
http://mail.gnome.org/mailman/listinfo/evolution-patches
2006-02-22-folder-name.diff (text/x-patch, 2 KB)
===================================================================
RCS file: /cvs/gnome/evolution/a11y/ChangeLog,v
retrieving revision 1.47
diff -u -r1.47 ChangeLog
--- ChangeLog	27 Jan 2006 14:50:37 -0000	1.47
+++ ChangeLog	22 Feb 2006 10:12:01 -0000
@@ -1,3 +1,9 @@
+2006-02-22  Boby Wang <[email protected]>
+	Fix for #319308
+
+	* addressbook/ea-minicard-view.c: (ea_minicard_view_get_name):
+	add the folder name to the name of current minicard view
+
 2006-01-27  Kjartan Maraas  <[email protected]>
 
 	reviewed by: Harish Krishnaswamy <[email protected]> 
Index: addressbook/ea-minicard-view.c
===================================================================
RCS file: /cvs/gnome/evolution/a11y/addressbook/ea-minicard-view.c,v
retrieving revision 1.6
diff -u -r1.6 ea-minicard-view.c
--- addressbook/ea-minicard-view.c	7 Apr 2005 07:42:28 -0000	1.6
+++ addressbook/ea-minicard-view.c	22 Feb 2006 10:12:01 -0000
@@ -141,21 +141,32 @@
 {
 	EReflow *reflow;
 	gchar *string;
-	
+	EMinicardView *card_view;
+	EBook *book = NULL;
+	const gchar *source_name;
+
 	g_return_val_if_fail (EA_IS_MINICARD_VIEW (accessible), NULL);
 
 	reflow = E_REFLOW(atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (accessible)));
 
 	if (!reflow)
 		return NULL;
-
-	string = g_strdup_printf (ngettext ("current addressbook folder has %d card", 
-				   "current addressbook folder has %d cards", 
-				   reflow->count), reflow->count);
 	
+	/* Get the current name of minicard view*/
+	card_view = E_MINICARD_VIEW (reflow);
+	g_object_get (card_view->adapter, "book", &book, NULL);
+	g_assert (E_IS_BOOK (book));
+	source_name = e_source_peek_name (e_book_get_source (book));
+	if (!source_name)
+		source_name="";
+
+	string = g_strdup_printf (ngettext ("current address book folder %s has %d card",
+	                          "current address book folder %s has %d cards",
+	                          reflow->count), source_name, reflow->count);
 
 	ATK_OBJECT_CLASS (parent_class)->set_name (accessible, string);
 	g_free (string);
+	g_object_unref(book);
 	return accessible->name;
 }
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.