aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/gui
diff options
context:
space:
mode:
Diffstat (limited to 'addressbook/gui')
-rw-r--r--addressbook/gui/component/Makefile.am4
-rw-r--r--addressbook/gui/component/addressbook.c37
-rw-r--r--addressbook/gui/widgets/e-addressbook-model.c1
-rw-r--r--addressbook/gui/widgets/e-addressbook-view.c8
4 files changed, 27 insertions, 23 deletions
diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am
index 29d3663f56..68138c8390 100644
--- a/addressbook/gui/component/Makefile.am
+++ b/addressbook/gui/component/Makefile.am
@@ -20,7 +20,9 @@ INCLUDES = \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \
-DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
- -DCAMEL_PROVIDERDIR=\""$(providerdir)"\"
+ -DCAMEL_PROVIDERDIR=\""$(providerdir)"\" \
+ -DEVOLUTION_IMAGESDIR=\""$(datadir)"/images/evolution\"
+
bin_PROGRAMS = \
evolution-addressbook
diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c
index 9cc11635d8..c2a1ca4631 100644
--- a/addressbook/gui/component/addressbook.c
+++ b/addressbook/gui/component/addressbook.c
@@ -28,10 +28,12 @@
#include "select-names/e-select-names-manager.h"
#include "evolution-shell-component-utils.h"
+#include "evolution-activity-client.h"
#include "e-contact-editor.h"
#include "e-contact-save-as.h"
#include "addressbook-config.h"
#include "addressbook.h"
+#include "addressbook-component.h"
#include "addressbook/gui/search/e-addressbook-search-dialog.h"
#include "addressbook/gui/widgets/e-addressbook-view.h"
#include "addressbook/gui/widgets/e-addressbook-util.h"
@@ -41,6 +43,10 @@
#include <widgets/misc/e-search-bar.h>
#include <widgets/misc/e-filter-bar.h>
+/* This is used for the addressbook status bar */
+#define EVOLUTION_CONTACTS_PROGRESS_IMAGE "evolution-contacts-mini.png"
+static GdkPixbuf *progress_icon[2] = { NULL, NULL };
+
#define d(x)
#define PROPERTY_FOLDER_URI "folder_uri"
@@ -51,6 +57,7 @@ typedef struct {
EAddressbookView *view;
ESearchBar *search;
GtkWidget *vbox;
+ EvolutionActivityClient *activity;
BonoboControl *control;
BonoboPropertyBag *properties;
char *uri;
@@ -779,27 +786,29 @@ retrieve_shell_view_interface_from_control (BonoboControl *control)
static void
set_status_message (EAddressbookView *eav, const char *message, AddressbookView *view)
{
- CORBA_Environment ev;
- GNOME_Evolution_ShellView shell_view_interface;
- CORBA_exception_init (&ev);
-
- shell_view_interface = retrieve_shell_view_interface_from_control (view->control);
- if (!shell_view_interface) {
- CORBA_exception_free (&ev);
- return;
+ if (!message || !*message) {
+ if (view->activity) {
+ gtk_object_unref (GTK_OBJECT (view->activity));
+ view->activity = NULL;
+ }
}
+ else if (!view->activity) {
+ int display;
+ char *clientid = g_strdup_printf ("%p", view);
- if (message == NULL || message[0] == 0) {
- GNOME_Evolution_ShellView_unsetMessage (shell_view_interface, &ev);
+ if (progress_icon[0] == NULL)
+ progress_icon[0] = gdk_pixbuf_new_from_file (EVOLUTION_IMAGESDIR "/" EVOLUTION_CONTACTS_PROGRESS_IMAGE);
+
+ view->activity = evolution_activity_client_new (addressbook_component_get_shell_client(), clientid,
+ progress_icon, message, TRUE, &display);
+
+ g_free (clientid);
}
else {
- GNOME_Evolution_ShellView_setMessage (shell_view_interface,
- message,
- e_addressbook_view_can_stop (view->view), &ev);
+ evolution_activity_client_update (view->activity, message, -1.0);
}
- CORBA_exception_free (&ev);
}
static void
diff --git a/addressbook/gui/widgets/e-addressbook-model.c b/addressbook/gui/widgets/e-addressbook-model.c
index d4a71d498a..e43772abf8 100644
--- a/addressbook/gui/widgets/e-addressbook-model.c
+++ b/addressbook/gui/widgets/e-addressbook-model.c
@@ -224,6 +224,7 @@ sequence_complete (EBookView *book_view,
EAddressbookModel *model)
{
model->search_in_progress = FALSE;
+ status_message (book_view, NULL, model);
gtk_signal_emit (GTK_OBJECT (model),
e_addressbook_model_signals [STOP_STATE_CHANGED]);
}
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index bf07164486..50ae8d2d0e 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -796,8 +796,6 @@ table_drag_data_get (ETable *table,
{
EAddressbookView *view = user_data;
- printf ("table_drag_data_get (row %d, col %d)\n", row, col);
-
if (!E_IS_ADDRESSBOOK_TABLE_ADAPTER(view->object))
return;
@@ -1246,10 +1244,6 @@ e_addressbook_view_print(EAddressbookView *view)
static void
card_deleted_cb (EBook* book, EBookStatus status, gpointer user_data)
{
- EAddressbookView *view = user_data;
-
- emit_status_message (view, _("Done."));
-
if (status != E_BOOK_STATUS_SUCCESS) {
e_addressbook_error_dialog (_("Error removing card"), status);
}
@@ -1280,8 +1274,6 @@ e_addressbook_view_delete_selection(EAddressbookView *view)
g_return_if_fail (model);
- emit_status_message (view, _("Removing cards..."));
-
e_selection_model_foreach (model,
do_remove,
view);