(trunk gtk) more dead code removal

diff --git a/gtk/main.c b/gtk/main.c
index 23d531e7a5b8e32b97dcdf06371f4d90414ac9d7..dbeb0e4f6e19e117765d99f1fbd8cde70ae7457f 100644 (file)
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -1008,7 +1008,7 @@ wannaquit( gpointer vdata )
     gtk_table_attach_defaults( GTK_TABLE( p ), w, 1, 2, 1, 2 );
 
     b = gtk_alignment_new( 0.0, 1.0, 0.01, 0.01 );
-    w = gtr_button_new_from_stock( GTK_STOCK_QUIT, _( "_Quit Now" ) );
+    w = gtk_button_new_with_mnemonic( _( "_Quit Now" ) );
     g_signal_connect( w, "clicked", G_CALLBACK( do_exit_cb ), NULL );
     gtk_container_add( GTK_CONTAINER( b ), w );
     gtk_table_attach( GTK_TABLE( p ), b, 1, 2, 2, 3, GTK_FILL, GTK_FILL, 0, 10 );

diff --git a/gtk/makemeta-ui.c b/gtk/makemeta-ui.c
index 2d1620e3533398ddf36a5a21f696d7ae6b51c559..b3b0c2c671a95e16f075fd5d5071e9a4a91a3929 100644 (file)
--- a/gtk/makemeta-ui.c
+++ b/gtk/makemeta-ui.c
@@ -521,7 +521,6 @@ make_meta_ui( GtkWindow  * parent, TrCore * core )
 
     gtk_drag_dest_set( d, GTK_DEST_DEFAULT_ALL, NULL, 0, GDK_ACTION_COPY );
     gtk_drag_dest_add_uri_targets( d );
-    gtk_drag_dest_add_text_targets( d );
     g_signal_connect( d, "drag-data-received", G_CALLBACK( on_drag_data_received ), ui );
 
     return d;

diff --git a/gtk/tr-prefs.c b/gtk/tr-prefs.c
index c999c0ae21447e4a3897d23bc1a88ee4ae9f3ae1..07a369321c545a05700b6c3e2abf4943e01b17b1 100644 (file)
--- a/gtk/tr-prefs.c
+++ b/gtk/tr-prefs.c
@@ -496,7 +496,7 @@ privacyPage( GObject * core )
     updateBlocklistText( w, TR_CORE( core ) );
     h = gtk_hbox_new( FALSE, GUI_PAD_BIG );
     gtk_box_pack_start( GTK_BOX( h ), w, TRUE, TRUE, 0 );
-    b = data->updateBlocklistButton = gtr_button_new_from_stock( GTK_STOCK_REFRESH, _( "_Update" ) );
+    b = data->updateBlocklistButton = gtk_button_new_with_mnemonic( _( "_Update" ) );
     data->check = w;
     g_object_set_data( G_OBJECT( b ), "session",
                       tr_core_session( TR_CORE( core ) ) );
@@ -763,7 +763,7 @@ webPage( GObject * core )
     g_signal_connect( w, "clicked", G_CALLBACK( onRPCToggled ), page );
     h = gtk_hbox_new( FALSE, GUI_PAD_BIG );
     gtk_box_pack_start( GTK_BOX( h ), w, TRUE, TRUE, 0 );
-    w = gtr_button_new_from_stock( GTK_STOCK_OPEN, _( "_Open web client" ) );
+    w = gtk_button_new_with_mnemonic( _( "_Open web client" ) );
     page->widgets = g_slist_append( page->widgets, w );
     g_signal_connect( w, "clicked", G_CALLBACK( onLaunchClutchCB ), NULL );
     gtk_box_pack_start( GTK_BOX( h ), w, FALSE, FALSE, 0 );

diff --git a/gtk/util.c b/gtk/util.c
index bceeee4090511998021de14cf14874e6db61d0b2..3d50ef7767dd245b570f8a43edaa197ff9243c99 100644 (file)
--- a/gtk/util.c
+++ b/gtk/util.c
@@ -585,18 +585,6 @@ gtr_dbus_present_window( void )
     return success;
 }
 
-GtkWidget *
-gtr_button_new_from_stock( const char * stock,
-                           const char * mnemonic )
-{
-    GtkWidget * image = gtk_image_new_from_stock( stock,
-                                                  GTK_ICON_SIZE_BUTTON );
-    GtkWidget * button = gtk_button_new_with_mnemonic( mnemonic );
-
-    gtk_button_set_image( GTK_BUTTON( button ), image );
-    return button;
-}
-
 /***
 ****
 ***/

diff --git a/gtk/util.h b/gtk/util.h
index 995d9a5bc2994c4e1532995d17b73d99634b9207..4f8017d3d2b4e9656570a8c064f41634f5e0ef19 100644 (file)
--- a/gtk/util.h
+++ b/gtk/util.h
@@ -148,15 +148,6 @@ gpointer gtr_object_ref_sink( gpointer object );
 /* backwards-comparible wrapper around g_strcmp0() */
 int gtr_strcmp0( const char * str1, const char * str2 );
 
-/***
-****
-***/
-
-/* create a button with the specified mnemonic and stock icon */
-GtkWidget * gtr_button_new_from_stock( const char * stock,
-                                       const char * mnemonic );
-
-
 /***
 ****
 ***/