Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2026-05-08 09:39:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

(gtk) don't use code marked as deprecated in gtk 2.14

Browse Source
This commit is contained in:
Charles Kerr
2008-10-31 18:25:21 +00:00
parent 1799cd2b35
commit d698ff7510
18 changed files with 42 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gtk/Makefile.am
+1 -1
View File
@@ -1,7 +1,7 @@
SUBDIRS = icons
if TR_UNSTABLE
GTK_EXTRA_CPPFLAGS="-DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED"
GTK_EXTRA_CPPFLAGS=-DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DG_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES
endif
sexy-marshal.h: marshal.list
gtk/add-dialog.c
+1 -1
View File
@@ -384,7 +384,7 @@ addSingleTorrentDialog( GtkWindow * parent,
t ), w, col, col + 2, row, row + 1, GTK_FILL, 0,
0, 0 );
gtk_box_pack_start_defaults( GTK_BOX( GTK_DIALOG( d )->vbox ), t );
gtk_box_pack_start( GTK_BOX( GTK_DIALOG( d )->vbox ), t, TRUE, TRUE, 0 );
gtk_widget_show_all( d );
return d;
}
gtk/add-dialog.h
+1 -1
View File
@@ -13,7 +13,7 @@
#ifndef TR_GTK_ADD_DIALOG_H
#define TR_GTK_ADD_DIALOG_H
#include <gtk/gtkwindow.h>
#include <gtk/gtk.h>
#include "tr-core.h"
/* This dialog assumes ownership of the ctor */
gtk/details.c
+8 -6
View File
@@ -868,7 +868,7 @@ peer_page_new( TrTorrent * gtor )
/* h = gtk_hbox_new (FALSE, GUI_PAD); */
/* gtk_box_pack_start_defaults (GTK_BOX(h), sw); */
gtk_box_pack_start_defaults( GTK_BOX( vbox ), sw );
gtk_box_pack_start( GTK_BOX( vbox ), sw, TRUE, TRUE, 0 );
hbox = gtk_hbox_new ( FALSE, GUI_PAD );
l = gtk_label_new ( NULL );
@@ -876,15 +876,17 @@ peer_page_new( TrTorrent * gtor )
gtk_box_pack_start ( GTK_BOX( hbox ), l, FALSE, FALSE, 0 );
l = p->seeders_lb = gtk_label_new ( NULL );
gtk_box_pack_start ( GTK_BOX( hbox ), l, FALSE, FALSE, 0 );
gtk_box_pack_start_defaults ( GTK_BOX( hbox ),
gtk_alignment_new ( 0.0f, 0.0f, 0.0f, 0.0f ) );
gtk_box_pack_start( GTK_BOX( hbox ),
gtk_alignment_new ( 0.0f, 0.0f, 0.0f, 0.0f ),
TRUE, TRUE, 0 );
l = gtk_label_new ( NULL );
gtk_label_set_markup ( GTK_LABEL( l ), _( "<b>Leechers:</b>" ) );
gtk_box_pack_start ( GTK_BOX( hbox ), l, FALSE, FALSE, 0 );
l = p->leechers_lb = gtk_label_new ( NULL );
gtk_box_pack_start ( GTK_BOX( hbox ), l, FALSE, FALSE, 0 );
gtk_box_pack_start_defaults ( GTK_BOX( hbox ),
gtk_alignment_new ( 0.0f, 0.0f, 0.0f, 0.0f ) );
gtk_box_pack_start( GTK_BOX( hbox ),
gtk_alignment_new ( 0.0f, 0.0f, 0.0f, 0.0f ),
TRUE, TRUE, 0 );
l = gtk_label_new ( NULL );
gtk_label_set_markup ( GTK_LABEL( l ), _( "<b>Times Completed:</b>" ) );
gtk_box_pack_start ( GTK_BOX( hbox ), l, FALSE, FALSE, 0 );
@@ -1560,7 +1562,7 @@ torrent_inspector_new( GtkWindow * parent,
gtk_notebook_append_page ( GTK_NOTEBOOK( n ), w,
gtk_label_new ( _( "Options" ) ) );
gtk_box_pack_start_defaults ( GTK_BOX( GTK_DIALOG( d )->vbox ), n );
gtk_box_pack_start( GTK_BOX( GTK_DIALOG( d )->vbox ), n, TRUE, TRUE, 0 );
tag = g_timeout_add ( UPDATE_INTERVAL_MSEC, periodic_refresh, d );
g_object_set_data_full ( G_OBJECT( d ), "tag",
gtk/details.h
+1 -1
View File
@@ -13,7 +13,7 @@
#ifndef GTK_TORRENT_INSPECTOR_H
#define GTK_TORRENT_INSPECTOR_H
#include <gtk/gtkwindow.h>
#include <gtk/gtk.h>
#include "tr-torrent.h"
GtkWidget* torrent_inspector_new( GtkWindow * parent,
gtk/file-list.h
+1 -1
View File
@@ -25,7 +25,7 @@
#ifndef GTK_TORRENT_FILE_LIST_H
#define GTK_TORRENT_FILE_LIST_H
#include <gtk/gtkwidget.h>
#include <gtk/gtk.h>
#include "tr-torrent.h"
/* create a new file list */
gtk/hig.h
+1 -1
View File
@@ -13,7 +13,7 @@
#ifndef __HIG_H__
#define __HIG_H__
#include <gtk/gtkwidget.h>
#include <gtk/gtk.h>
/**
*** utility code for making dialog layout that follows the Gnome HIG.
gtk/makemeta-ui.c
+5 -5
View File
@@ -408,18 +408,18 @@ make_meta_ui( GtkWindow * parent,
gtk_box_pack_end( GTK_BOX( h2 ), w, FALSE, FALSE, GUI_PAD_SMALL );
w = gtk_alignment_new( 0.0f, 0.0f, 0.0f, 0.0f );
gtk_widget_set_size_request ( w, 2 * GUI_PAD_BIG, 0 );
gtk_box_pack_start_defaults ( GTK_BOX( h2 ), w );
gtk_box_pack_start( GTK_BOX( h2 ), w, TRUE, TRUE, 0 );
gtk_box_pack_start( GTK_BOX( v ), h2, FALSE, FALSE, 0 );
gtk_box_pack_start_defaults( GTK_BOX( h ), v );
gtk_box_pack_start( GTK_BOX( h ), v, TRUE, TRUE, 0 );
v = gtk_vbox_new( FALSE, GUI_PAD_SMALL );
w = gtr_button_new_from_stock( GTK_STOCK_DIRECTORY, _( "F_older" ) );
focusMe = w;
g_signal_connect( w, "clicked", G_CALLBACK(
onChooseDirectoryClicked ), ui );
gtk_box_pack_start_defaults( GTK_BOX( v ), w );
gtk_box_pack_start( GTK_BOX( v ), w, TRUE, TRUE, 0 );
w = gtr_button_new_from_stock( GTK_STOCK_FILE, _( "_File" ) );
g_signal_connect( w, "clicked", G_CALLBACK( onChooseFileClicked ), ui );
gtk_box_pack_start_defaults( GTK_BOX( v ), w );
gtk_box_pack_start( GTK_BOX( v ), w, TRUE, TRUE, 0 );
gtk_box_pack_start( GTK_BOX( h ), v, FALSE, FALSE, 0 );
hig_workarea_add_wide_control( t, &row, h );
@@ -479,7 +479,7 @@ make_meta_ui( GtkWindow * parent,
}
hig_workarea_finish( t, &row );
gtk_box_pack_start_defaults( main_vbox, t );
gtk_box_pack_start( main_vbox, t, TRUE, TRUE, 0 );
w = gtk_frame_new( NULL );
gtk_frame_set_shadow_type( GTK_FRAME( w ), GTK_SHADOW_NONE );
gtk/sexy-icon-entry.c
+1 -1
View File
@@ -150,7 +150,7 @@ sexy_icon_entry_class_init(SexyIconEntryClass *klass)
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET(SexyIconEntryClass, icon_released),
NULL, NULL,
gtk_marshal_VOID__INT_INT,
sexy_marshal_VOID__INT_INT,
G_TYPE_NONE, 2,
G_TYPE_INT,
G_TYPE_INT);
gtk/sexy-icon-entry.h
+1 -2
View File
@@ -25,8 +25,7 @@ typedef struct _SexyIconEntry SexyIconEntry;
typedef struct _SexyIconEntryClass SexyIconEntryClass;
typedef struct _SexyIconEntryPriv SexyIconEntryPriv;
#include <gtk/gtkentry.h>
#include <gtk/gtkimage.h>
#include <gtk/gtk.h>
#define SEXY_TYPE_ICON_ENTRY ( sexy_icon_entry_get_type( ) )
#define SEXY_ICON_ENTRY( obj ) \
gtk/stats.c
+1 -1
View File
@@ -139,7 +139,7 @@ stats_dialog_create( GtkWindow * parent,
TR_RESPONSE_CLEAR,
-1 );
t = hig_workarea_create( );
gtk_box_pack_start_defaults( GTK_BOX( GTK_DIALOG( d )->vbox ), t );
gtk_box_pack_start( GTK_BOX( GTK_DIALOG( d )->vbox ), t, TRUE, TRUE, 0 );
ui->core = core;
hig_workarea_add_section_title( t, &row, _( "Current Session" ) );
gtk/stats.h
+1 -2
View File
@@ -13,8 +13,7 @@
#ifndef __TR_GTK_STATS_H__
#define __TR_GTK_STATS_H__
#include <gtk/gtkwidget.h>
#include <gtk/gtkwindow.h>
#include <gtk/gtk.h>
#include "tr-core.h"
GtkWidget* stats_dialog_create( GtkWindow * parent,
gtk/torrent-cell-renderer.c
-2
View File
@@ -12,8 +12,6 @@
#include "assert.h"
#include <gtk/gtk.h>
#include <gtk/gtkcellrenderertext.h>
#include <gtk/gtkcellrendererprogress.h>
#include <glib/gi18n.h>
#include <libtransmission/transmission.h>
#include "hig.h"
gtk/torrent-cell-renderer.h
+1 -1
View File
@@ -14,7 +14,7 @@
#define TORRENT_CELL_RENDERER_H
#include <glib-object.h>
#include <gtk/gtkcellrenderer.h>
#include <gtk/gtk.h>
#define TORRENT_CELL_RENDERER_TYPE ( torrent_cell_renderer_get_type( ) )
gtk/tr-prefs.c
+11 -10
View File
@@ -533,7 +533,7 @@ peerPage( GObject * core )
w = new_check_button( "", PREF_KEY_BLOCKLIST_ENABLED, core );
updateBlocklistText( w, TR_CORE( core ) );
h = gtk_hbox_new( FALSE, GUI_PAD_BIG );
gtk_box_pack_start_defaults( GTK_BOX( h ), w );
gtk_box_pack_start( GTK_BOX( h ), w, TRUE, TRUE, 0 );
b = gtr_button_new_from_stock( GTK_STOCK_REFRESH, _( "_Update" ) );
data->check = w;
g_object_set_data( G_OBJECT( b ), "session",
@@ -788,7 +788,7 @@ webPage( GObject * core )
page->rpc_tb = GTK_TOGGLE_BUTTON( w );
g_signal_connect( w, "clicked", G_CALLBACK( onRPCToggled ), page );
h = gtk_hbox_new( FALSE, GUI_PAD_BIG );
gtk_box_pack_start_defaults( GTK_BOX( h ), w );
gtk_box_pack_start( GTK_BOX( h ), w, TRUE, TRUE, 0 );
w = gtk_button_new_from_stock( GTK_STOCK_OPEN );
page->widgets = g_slist_append( page->widgets, w );
g_signal_connect( w, "clicked", G_CALLBACK( onLaunchClutchCB ), NULL );
@@ -842,7 +842,6 @@ webPage( GObject * core )
GtkTreeView * v;
GtkWidget * w;
GtkWidget * h;
GtkTooltips * tips = gtk_tooltips_new( );
page->store = GTK_LIST_STORE( m );
w = gtk_tree_view_new_with_model( m );
@@ -851,8 +850,10 @@ webPage( GObject * core )
page->whitelist_widgets = g_slist_append( page->whitelist_widgets, w );
v = page->view = GTK_TREE_VIEW( w );
gtk_tooltips_set_tip( tips, w,
_( "IP addresses may use wildcards, such as 192.168.*.*" ), NULL );
#if GTK_CHECK_VERSION( 2,12,0 )
gtk_widget_set_tooltip_text( w,
_( "IP addresses may use wildcards, such as 192.168.*.*" ) );
#endif
sel = gtk_tree_view_get_selection( v );
g_signal_connect( sel, "changed",
G_CALLBACK( onWhitelistSelectionChanged ), page );
@@ -886,14 +887,14 @@ webPage( GObject * core )
onRemoveWhitelistClicked ), page );
page->remove_button = w;
onWhitelistSelectionChanged( sel, page );
gtk_box_pack_start_defaults( GTK_BOX( h ), w );
gtk_box_pack_start( GTK_BOX( h ), w, TRUE, TRUE, 0 );
w = gtk_button_new_from_stock( GTK_STOCK_ADD );
page->whitelist_widgets = g_slist_append( page->whitelist_widgets, w );
g_signal_connect( w, "clicked", G_CALLBACK( onAddWhitelistClicked ), page );
gtk_box_pack_start_defaults( GTK_BOX( h ), w );
gtk_box_pack_start( GTK_BOX( h ), w, TRUE, TRUE, 0 );
w = gtk_hbox_new( FALSE, 0 );
gtk_box_pack_start_defaults( GTK_BOX( w ),
gtk_alignment_new( 0, 0, 0, 0 ) );
gtk_box_pack_start( GTK_BOX( w ), gtk_alignment_new( 0, 0, 0, 0 ),
TRUE, TRUE, 0 );
gtk_box_pack_start( GTK_BOX( w ), h, FALSE, FALSE, 0 );
hig_workarea_add_wide_control( t, &row, w );
}
@@ -1411,7 +1412,7 @@ tr_prefs_dialog_new( GObject * core,
gtk_label_new ( _( "Trackers" ) ) );
g_signal_connect( d, "response", G_CALLBACK( response_cb ), core );
gtk_box_pack_start_defaults( GTK_BOX( GTK_DIALOG( d )->vbox ), n );
gtk_box_pack_start( GTK_BOX( GTK_DIALOG( d )->vbox ), n, TRUE, TRUE, 0 );
gtk_widget_show_all( GTK_DIALOG( d )->vbox );
return d;
}
gtk/tr-window.c
+1 -1
View File
@@ -673,7 +673,7 @@ tr_window_new( GtkUIManager * ui_manager,
gtk_scrolled_window_set_shadow_type( GTK_SCROLLED_WINDOW(
w ), GTK_SHADOW_IN );
gtk_container_add( GTK_CONTAINER( w ), p->view );
gtk_box_pack_start_defaults( GTK_BOX( vbox ), w );
gtk_box_pack_start( GTK_BOX( vbox ), w, TRUE, TRUE, 0 );
gtk_container_set_focus_child( GTK_CONTAINER( vbox ), w );
/* show all but the window */
gtk/tracker-list.c
+5 -5
View File
@@ -361,12 +361,12 @@ tracker_list_new( TrTorrent * gtor )
w = gtk_button_new_from_stock( GTK_STOCK_ADD );
g_signal_connect( w, "clicked", G_CALLBACK( onTrackerAddClicked ), page );
gtk_box_pack_start_defaults( GTK_BOX( buttons ), w );
gtk_box_pack_start( GTK_BOX( buttons ), w, TRUE, TRUE, 0 );
page->add_button = w;
w = gtk_button_new_from_stock( GTK_STOCK_REMOVE );
g_signal_connect( w, "clicked", G_CALLBACK(
onTrackerRemoveClicked ), page );
gtk_box_pack_start_defaults( GTK_BOX( buttons ), w );
gtk_box_pack_start( GTK_BOX( buttons ), w, TRUE, TRUE, 0 );
page->remove_button = w;
if( gtor )
{
@@ -374,19 +374,19 @@ tracker_list_new( TrTorrent * gtor )
g_signal_connect( w, "clicked", G_CALLBACK(
onTrackerSaveClicked ), page );
gtk_widget_set_sensitive( w, FALSE );
gtk_box_pack_start_defaults( GTK_BOX( buttons ), w );
gtk_box_pack_start( GTK_BOX( buttons ), w, TRUE, TRUE, 0 );
page->save_button = w;
w = gtk_button_new_from_stock( GTK_STOCK_REVERT_TO_SAVED );
g_signal_connect( w, "clicked", G_CALLBACK(
onTrackerRevertClicked ), page );
gtk_widget_set_sensitive( w, FALSE );
gtk_box_pack_start_defaults( GTK_BOX( buttons ), w );
gtk_box_pack_start( GTK_BOX( buttons ), w, TRUE, TRUE, 0 );
page->revert_button = w;
}
gtk_box_pack_start( GTK_BOX( box ), buttons, FALSE, FALSE, 0 );
gtk_box_pack_start_defaults( GTK_BOX( top ), fr );
gtk_box_pack_start( GTK_BOX( top ), fr, TRUE, TRUE, 0 );
gtk_box_pack_start( GTK_BOX( top ), box, FALSE, FALSE, 0 );
onTrackerSelectionChanged( sel, page );
gtk/tracker-list.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef TRACKER_LIST_H
#define TRACKER_LIST_H
#include <gtk/gtkwidget.h>
#include <gtk/gtk.h>
#include "tr-torrent.h"
GtkWidget* tracker_list_new( TrTorrent * gtor );