mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2024-12-25 09:13:06 +00:00
Code Issues Releases Wiki Activity

fix the cyclical header dependency, and fix a couple of warnings sniffed out by gcc 4.3

Browse source
This commit is contained in:
Charles Kerr 2008-05-19 00:12:31 +00:00
parent 035869d802
commit dde9cb49f2
3 changed files with 5 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
daemon/remote.c
View file

@ -7,7 +7,7 @@
* This exemption does not extend to derived works not owned by * This exemption does not extend to derived works not owned by
* the Transmission project. * the Transmission project.
* *
* $Id:$ * $Id$
*/ */
#include <stdio.h> #include <stdio.h>
@ -280,8 +280,8 @@ processRequests( const char * host, int port,
curl = curl_easy_init( ); curl = curl_easy_init( );
curl_easy_setopt( curl, CURLOPT_VERBOSE, debug ); curl_easy_setopt( curl, CURLOPT_VERBOSE, debug );
curl_easy_setopt( curl, CURLOPT_USERAGENT, MY_NAME"/"LONG_VERSION_STRING ); curl_easy_setopt( curl, CURLOPT_USERAGENT, MY_NAME"/"LONG_VERSION_STRING );
curl_easy_setopt( curl, CURLOPT_WRITEFUNCTION, writeFunc, 0 ); curl_easy_setopt( curl, CURLOPT_WRITEFUNCTION, writeFunc );
curl_easy_setopt( curl, CURLOPT_WRITEDATA, buf, 0 ); curl_easy_setopt( curl, CURLOPT_WRITEDATA, buf );
for( i=0; i<reqCount; ++i ) for( i=0; i<reqCount; ++i )
{ {

12
gtk/main.c
View file

@ -664,18 +664,6 @@ quitThreadFunc( gpointer gdata )
return NULL; return NULL;
} }
/* since there are no buttons in the dialog, gtk tries to
* select one of the labels, which looks ugly... so force
* the dialog's primary and secondary labels to be unselectable */
static void
deselectLabels( GtkWidget * w, gpointer unused UNUSED )
{
if( GTK_IS_LABEL( w ) )
gtk_label_set_selectable( GTK_LABEL(w), FALSE );
else if( GTK_IS_CONTAINER( w ) )
gtk_container_foreach( GTK_CONTAINER(w), deselectLabels, NULL );
}
static void static void
do_exit_cb( GtkWidget *w UNUSED, gpointer data UNUSED ) do_exit_cb( GtkWidget *w UNUSED, gpointer data UNUSED )
{ {

7
libtransmission/session.h
View file

@ -25,8 +25,6 @@
#ifndef TR_INTERNAL_H #ifndef TR_INTERNAL_H
#define TR_INTERNAL_H 1 #define TR_INTERNAL_H 1
#include <libtransmission/rpc.h>
#define TR_NAME "Transmission" #define TR_NAME "Transmission"
#ifndef UNUSED #ifndef UNUSED
@ -57,9 +55,6 @@ struct tr_handle
unsigned int useUploadLimit : 1; unsigned int useUploadLimit : 1;
unsigned int useDownloadLimit : 1; unsigned int useDownloadLimit : 1;
tr_rpc_func rpc_func;
void * rpc_func_user_data;
tr_encryption_mode encryptionMode; tr_encryption_mode encryptionMode;
struct tr_event_handle * events; struct tr_event_handle * events;
@ -88,6 +83,8 @@ struct tr_handle
struct tr_web * web; struct tr_web * web;
struct tr_rpc_server * rpcServer; struct tr_rpc_server * rpcServer;
tr_rpc_func rpc_func;
void * rpc_func_user_data;
tr_handle_status stats[2]; tr_handle_status stats[2];
int statCur; int statCur;