diff options
| author | Matthew Barnes <mbarnes@src.gnome.org> | 2008-08-08 12:26:12 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2008-08-08 12:26:12 +0800 |
| commit | cea054cd54d84479352a43bbabc19c9ce9af5efb (patch) | |
| tree | ba02763209ba0f22989024004f57689071603ec5 /plugins/bbdb | |
| parent | 91a6b6899e5568ed34f913bedb538dd6c9e35b32 (diff) | |
| download | gsoc2013-evolution-cea054cd54d84479352a43bbabc19c9ce9af5efb.tar gsoc2013-evolution-cea054cd54d84479352a43bbabc19c9ce9af5efb.tar.gz gsoc2013-evolution-cea054cd54d84479352a43bbabc19c9ce9af5efb.tar.bz2 gsoc2013-evolution-cea054cd54d84479352a43bbabc19c9ce9af5efb.tar.lz gsoc2013-evolution-cea054cd54d84479352a43bbabc19c9ce9af5efb.tar.xz gsoc2013-evolution-cea054cd54d84479352a43bbabc19c9ce9af5efb.tar.zst gsoc2013-evolution-cea054cd54d84479352a43bbabc19c9ce9af5efb.zip | |
Merge revisions 35747:35930 from trunk.
svn path=/branches/kill-bonobo/; revision=35931
Diffstat (limited to 'plugins/bbdb')
| -rw-r--r-- | plugins/bbdb/ChangeLog | 15 | ||||
| -rw-r--r-- | plugins/bbdb/bbdb.c | 8 |
2 files changed, 20 insertions, 3 deletions
diff --git a/plugins/bbdb/ChangeLog b/plugins/bbdb/ChangeLog index 18b7b6afbc..53d5e13f7e 100644 --- a/plugins/bbdb/ChangeLog +++ b/plugins/bbdb/ChangeLog @@ -1,3 +1,18 @@ +2008-08-07 Paul Bolle <pebolle@tiscali.nl> + + ** Fixes bug #546785 + + * bbdb.c: (e_plugin_lib_enable): The bbdb plugin is noisy when + enabled: + "BBDB spinning up..." + Make this plugin just as polite as google-account-setup. + +2008-07-28 Lucian Langa <lucilanga@gnome.org> + + ** See bug #504417 + + * bbdb.c: - Preferences window cut off + 2008-01-10 Milan Crha <mcrha@redhat.com> ** Fix for bug #496402 diff --git a/plugins/bbdb/bbdb.c b/plugins/bbdb/bbdb.c index feac342232..98db91fb99 100644 --- a/plugins/bbdb/bbdb.c +++ b/plugins/bbdb/bbdb.c @@ -49,6 +49,8 @@ #include "bbdb.h" +#define d(x) + /* Plugin hooks */ int e_plugin_lib_enable (EPluginLib *ep, int enable); void bbdb_handle_reply (EPlugin *ep, EMEventTargetMessage *target); @@ -119,7 +121,7 @@ e_plugin_lib_enable (EPluginLib *ep, int enable) { /* Start up the plugin. */ if (enable) { - fprintf (stderr, "BBDB spinning up...\n"); + d(fprintf (stderr, "BBDB spinning up...\n")); if (bbdb_check_gaim_enabled ()) bbdb_sync_buddy_list_check (); @@ -562,7 +564,7 @@ bbdb_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data) gtk_box_pack_start (GTK_BOX (hbox), inner_vbox, FALSE, FALSE, 0); /* Enable BBDB checkbox */ - check = gtk_check_button_new_with_mnemonic (_("_Automatically create entries in the addressbook when responding to messages")); + check = gtk_check_button_new_with_mnemonic (_("_Auto-create addressbook entries when replying to messages")); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), gconf_client_get_bool (target->gconf, GCONF_KEY_ENABLE, NULL)); g_signal_connect (GTK_TOGGLE_BUTTON (check), "toggled", G_CALLBACK (enable_toggled_cb), stuff); gtk_box_pack_start (GTK_BOX (inner_vbox), check, FALSE, FALSE, 0); @@ -598,7 +600,7 @@ bbdb_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data) gtk_box_pack_start (GTK_BOX (hbox), inner_vbox, FALSE, FALSE, 0); /* Enable Gaim Checkbox */ - check_gaim = gtk_check_button_new_with_mnemonic (_("Periodically synchronize contact information and images from Pidgin buddy list")); + check_gaim = gtk_check_button_new_with_mnemonic (_("Synchronize contact info and images from Pidgin buddy list")); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_gaim), gconf_client_get_bool (target->gconf, GCONF_KEY_ENABLE_GAIM, NULL)); g_signal_connect (GTK_TOGGLE_BUTTON (check_gaim), "toggled", G_CALLBACK (enable_gaim_toggled_cb), stuff); gtk_box_pack_start (GTK_BOX (inner_vbox), check_gaim, FALSE, FALSE, 0); |