Merge new-ui-branch to the trunk.

svn path=/trunk/; revision=22965

2 files changed, 35 insertions, 34 deletions

diff --git a/addressbook/gui/search/e-addressbook-search-dialog.c b/addressbook/gui/search/e-addressbook-search-dialog.c
index eefd170a73..a8621bf5a7 100644
--- a/addressbook/gui/search/e-addressbook-search-dialog.c
+++ b/addressbook/gui/search/e-addressbook-search-dialog.c
@@ -30,23 +30,23 @@
 #include "e-addressbook-search-dialog.h"
 
 
-static void e_addressbook_search_dialog_init		 (EAddressbookSearchDialog		 *widget);
-static void e_addressbook_search_dialog_class_init	 (EAddressbookSearchDialogClass	 *klass);
-static void e_addressbook_search_dialog_dispose          (GObject *object);
+static void eab_search_dialog_init             (EABSearchDialog          *widget);
+static void eab_search_dialog_class_init       (EABSearchDialogClass     *klass);
+static void eab_search_dialog_dispose          (GObject *object);
 
 static GtkDialog *parent_class = NULL;
 
 #define PARENT_TYPE GTK_TYPE_DIALOG
 
-E_MAKE_TYPE (e_addressbook_search_dialog,
-	     "EAddressbookSearchDialog",
-	     EAddressbookSearchDialog,
-	     e_addressbook_search_dialog_class_init,
-	     e_addressbook_search_dialog_init,
+E_MAKE_TYPE (eab_search_dialog,
+	     "EABSearchDialog",
+	     EABSearchDialog,
+	     eab_search_dialog_class_init,
+	     eab_search_dialog_init,
 	     PARENT_TYPE)
 
 static void
-e_addressbook_search_dialog_class_init (EAddressbookSearchDialogClass *klass)
+eab_search_dialog_class_init (EABSearchDialogClass *klass)
 {
 	GObjectClass *object_class;
 
@@ -54,11 +54,11 @@ e_addressbook_search_dialog_class_init (EAddressbookSearchDialogClass *klass)
 
 	parent_class = g_type_class_ref (PARENT_TYPE);
 
-	object_class->dispose = e_addressbook_search_dialog_dispose;
+	object_class->dispose = eab_search_dialog_dispose;
 }
 
 static GtkWidget *
-get_widget (EAddressbookSearchDialog *view)
+get_widget (EABSearchDialog *view)
 {
 	FilterPart *part;
 
@@ -79,7 +79,7 @@ get_widget (EAddressbookSearchDialog *view)
 }
 
 static char *
-get_query (EAddressbookSearchDialog *view)
+get_query (EABSearchDialog *view)
 {
 	GString *out = g_string_new("");
 	char *ret;
@@ -92,7 +92,7 @@ get_query (EAddressbookSearchDialog *view)
 }
 
 static void
-dialog_response (GtkWidget *widget, int response_id, EAddressbookSearchDialog *dialog)
+dialog_response (GtkWidget *widget, int response_id, EABSearchDialog *dialog)
 {
 	char *query;
 
@@ -108,7 +108,7 @@ dialog_response (GtkWidget *widget, int response_id, EAddressbookSearchDialog *d
 }
 
 static void
-e_addressbook_search_dialog_init (EAddressbookSearchDialog *view)
+eab_search_dialog_init (EABSearchDialog *view)
 {
 	GtkDialog *dialog = GTK_DIALOG (view);
 
@@ -131,19 +131,19 @@ e_addressbook_search_dialog_init (EAddressbookSearchDialog *view)
 }
 
 GtkWidget *
-e_addressbook_search_dialog_new (EAddressbookView *addr_view)
+eab_search_dialog_new (EABView *addr_view)
 {
-	EAddressbookSearchDialog *view = g_object_new (E_ADDRESSBOOK_SEARCH_DIALOG_TYPE, NULL);
+	EABSearchDialog *view = g_object_new (EAB_SEARCH_DIALOG_TYPE, NULL);
 	view->view = addr_view;
 	return GTK_WIDGET(view);
 }
 
 static void
-e_addressbook_search_dialog_dispose (GObject *object)
+eab_search_dialog_dispose (GObject *object)
 {
-	EAddressbookSearchDialog *view;
+	EABSearchDialog *view;
 
-	view = E_ADDRESSBOOK_SEARCH_DIALOG (object);
+	view = EAB_SEARCH_DIALOG (object);
 
 	if (view->context) {
 		g_object_unref(view->context);
diff --git a/addressbook/gui/search/e-addressbook-search-dialog.h b/addressbook/gui/search/e-addressbook-search-dialog.h
index 4be0050ca0..ef501766ea 100644
--- a/addressbook/gui/search/e-addressbook-search-dialog.h
+++ b/addressbook/gui/search/e-addressbook-search-dialog.h
@@ -17,8 +17,9 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
-#ifndef __E_ADDRESSBOOK_SEARCH_DIALOG_H__
-#define __E_ADDRESSBOOK_SEARCH_DIALOG_H__
+
+#ifndef __EAB_SEARCH_DIALOG_H__
+#define __EAB_SEARCH_DIALOG_H__
 
 #include <ebook/e-book.h>
 
@@ -29,37 +30,37 @@
 
 G_BEGIN_DECLS
 
-#define E_ADDRESSBOOK_SEARCH_DIALOG_TYPE		(e_addressbook_search_dialog_get_type ())
-#define E_ADDRESSBOOK_SEARCH_DIALOG(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), E_ADDRESSBOOK_SEARCH_DIALOG_TYPE, EAddressbookSearchDialog))
-#define E_ADDRESSBOOK_SEARCH_DIALOG_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), E_ADDRESSBOOK_SEARCH_DIALOG_TYPE, EAddressbookSearchDialogClass))
-#define E_IS_ADDRESSBOOK_SEARCH_DIALOG(obj) 		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_ADDRESSBOOK_SEARCH_DIALOG_TYPE))
-#define E_IS_ADDRESSBOOK_SEARCH_DIALOG_CLASS(klass) 	(G_TYPE_CHECK_CLASS_TYPE ((obj), E_ADDRESSBOOK_SEARCH_DIALOG_TYPE))
+#define EAB_SEARCH_DIALOG_TYPE		(eab_search_dialog_get_type ())
+#define EAB_SEARCH_DIALOG(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), EAB_SEARCH_DIALOG_TYPE, EABSearchDialog))
+#define EAB_SEARCH_DIALOG_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), EAB_SEARCH_DIALOG_TYPE, EABSearchDialogClass))
+#define E_IS_ADDRESSBOOK_SEARCH_DIALOG(obj) 		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), EAB_SEARCH_DIALOG_TYPE))
+#define E_IS_ADDRESSBOOK_SEARCH_DIALOG_CLASS(klass) 	(G_TYPE_CHECK_CLASS_TYPE ((obj), EAB_SEARCH_DIALOG_TYPE))
 
 
-typedef struct _EAddressbookSearchDialog       EAddressbookSearchDialog;
-typedef struct _EAddressbookSearchDialogClass  EAddressbookSearchDialogClass;
+typedef struct _EABSearchDialog       EABSearchDialog;
+typedef struct _EABSearchDialogClass  EABSearchDialogClass;
 
-struct _EAddressbookSearchDialog
+struct _EABSearchDialog
 {
 	GtkDialog parent;
 
 	GtkWidget *search;
 
-	EAddressbookView *view;
+	EABView *view;
 
 	RuleContext *context;
 	FilterRule *rule;
 };
 
-struct _EAddressbookSearchDialogClass
+struct _EABSearchDialogClass
 {
 	GtkDialogClass parent_class;
 };
 
-GType      e_addressbook_search_dialog_get_type (void);
+GType      eab_search_dialog_get_type (void);
 
-GtkWidget *e_addressbook_search_dialog_new (EAddressbookView *view);
+GtkWidget *eab_search_dialog_new (EABView *view);
 
 G_END_DECLS
 
-#endif /* __E_ADDRESSBOOK_SEARCH_DIALOG_H__ */
+#endif /* __EAB_SEARCH_DIALOG_H__ */