Changeset 5845


Ignore:
Timestamp:
May 19, 2008, 12:12:31 AM (14 years ago)
Author:
charles
Message:

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

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/daemon/remote.c

    r5843 r5845  
    88 * the Transmission project.
    99 *
    10  * $Id:$
     10 * $Id$
    1111 */
    1212
     
    281281    curl_easy_setopt( curl, CURLOPT_VERBOSE, debug );
    282282    curl_easy_setopt( curl, CURLOPT_USERAGENT, MY_NAME"/"LONG_VERSION_STRING );
    283     curl_easy_setopt( curl, CURLOPT_WRITEFUNCTION, writeFunc, 0 );
    284     curl_easy_setopt( curl, CURLOPT_WRITEDATA, buf, 0 );
     283    curl_easy_setopt( curl, CURLOPT_WRITEFUNCTION, writeFunc );
     284    curl_easy_setopt( curl, CURLOPT_WRITEDATA, buf );
    285285
    286286    for( i=0; i<reqCount; ++i )
  • trunk/gtk/main.c

    r5844 r5845  
    665665}
    666666
    667 /* since there are no buttons in the dialog, gtk tries to
    668  * select one of the labels, which looks ugly... so force
    669  * the dialog's primary and secondary labels to be unselectable */
    670 static void
    671 deselectLabels( GtkWidget * w, gpointer unused UNUSED )
    672 {
    673     if( GTK_IS_LABEL( w ) )
    674         gtk_label_set_selectable( GTK_LABEL(w), FALSE );
    675     else if( GTK_IS_CONTAINER( w ) )
    676         gtk_container_foreach( GTK_CONTAINER(w), deselectLabels, NULL );
    677 }
    678 
    679667static void
    680668do_exit_cb( GtkWidget *w UNUSED, gpointer data UNUSED )
  • trunk/libtransmission/session.h

    r5843 r5845  
    2525#ifndef TR_INTERNAL_H
    2626#define TR_INTERNAL_H 1
    27 
    28 #include <libtransmission/rpc.h>
    2927
    3028#define TR_NAME "Transmission"
     
    5856    unsigned int                 useDownloadLimit : 1;
    5957
    60     tr_rpc_func                  rpc_func;
    61     void                       * rpc_func_user_data;
    62 
    6358    tr_encryption_mode           encryptionMode;
    6459
     
    8984
    9085    struct tr_rpc_server       * rpcServer;
     86    tr_rpc_func                  rpc_func;
     87    void                       * rpc_func_user_data;
    9188
    9289    tr_handle_status             stats[2];
Note: See TracChangeset for help on using the changeset viewer.