remove gtk_window_set_wmclass()

[claws.git] / src / addressbook.c

diff --git a/src/addressbook.c b/src/addressbook.c
index fc4a5c468a4fba243c91385da838f3a8a5eef45c..5ce8fca5441fe3befbd884132cf7b6282cfc309a 100644 (file)
--- a/src/addressbook.c
+++ b/src/addressbook.c
@@ -360,7 +360,9 @@ static void addressbook_treenode_paste_cb   ( void );
 
 static void addressbook_mail_to_cb             ( void );
 
+#ifdef USE_LDAP
 static void addressbook_browse_entry_cb                ( void );
+#endif
 
 static GtkItemFactoryEntry addressbook_entries[] =
 {
@@ -433,10 +435,9 @@ static GtkItemFactoryEntry addressbook_list_popup_entries[] =
        {N_("/_Paste"),         NULL, addressbook_clip_paste_cb,     0, NULL},
        {N_("/---"),            NULL, NULL, 0, "<Separator>"},
        {N_("/Pa_ste Address"), NULL, addressbook_clip_paste_address_cb, 0, NULL},
-       {N_("/_Mail To"),       NULL, addressbook_mail_to_cb,            0, NULL}
+       {N_("/_Mail To"),       NULL, addressbook_mail_to_cb,            0, NULL},
 #ifdef USE_LDAP
-       ,
-       {N_("/_Browse Entry"),  NULL, addressbook_browse_entry_cb,       0, NULL}
+       {N_("/_Browse Entry"),  NULL, addressbook_browse_entry_cb,       0, NULL},
 #endif 
 };
 
@@ -646,8 +647,7 @@ static void addressbook_create(void)
        window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
        gtk_window_set_title(GTK_WINDOW(window), _("Address book"));
        gtk_widget_set_size_request(window, ADDRESSBOOK_WIDTH, ADDRESSBOOK_HEIGHT);
-       gtk_window_set_policy(GTK_WINDOW(window), TRUE, TRUE, TRUE);
-       gtk_window_set_wmclass(GTK_WINDOW(window), "addressbook", "Sylpheed");
+       gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
        gtk_widget_realize(window);
 
        g_signal_connect(G_OBJECT(window), "delete_event",
@@ -3177,11 +3177,13 @@ static gboolean addressbook_convert( AddressIndex *addrIndex ) {
        }
        if( errFlag ) {
                debug_print( "Error\n%s\n", msg );
-               alertpanel( _( "Addressbook conversion error" ), msg, _( "Close" ), NULL, NULL );
+               alertpanel_with_type( _( "Addressbook conversion error" ), msg, _( "Close" ), 
+                                     NULL, NULL, NULL, ALERT_ERROR );
        }
        else if( msg ) {
                debug_print( "Warning\n%s\n", msg );
-               alertpanel( _( "Addressbook conversion" ), msg, _( "Close" ), NULL, NULL );
+               alertpanel_with_type( _( "Addressbook conversion" ), msg, _( "Close" ), 
+                                     NULL, NULL, NULL, ALERT_WARNING );
        }
 
        return retVal;
@@ -3217,9 +3219,10 @@ void addressbook_read_file( void ) {
                /* Error reading address book */
                debug_print( "Could not read address index.\n" );
                addrindex_print_index( addrIndex, stdout );
-               alertpanel( _( "Addressbook Error" ),
+               alertpanel_with_type( _( "Addressbook Error" ),
                            _( "Could not read address index" ),
-                           _( "Close" ), NULL, NULL );
+                           _( "Close" ), NULL, NULL, NULL,
+                           ALERT_ERROR);
        }
        debug_print( "done.\n" );
 }
@@ -3765,6 +3768,7 @@ static void addressbook_lup_clicked( GtkButton *button, gpointer data ) {
        g_free( searchTerm );
 }
 
+#ifdef USE_LDAP
 /**
  * Browse address entry for highlighted entry.
  */
@@ -3809,12 +3813,10 @@ static void addressbook_browse_entry_cb(void)
        }
 
        if( iface->type == ADDR_IF_LDAP ) {
-#ifdef USE_LDAP
                browseldap_entry(ds, person->externalID);
-#endif
        }
 }
-
+#endif
 
 /* **********************************************************************
 * Build lookup tables.