comparison pidgin/gtkft.c @ 31969:a2febd62ec3d

Update Pidgin to use the new accessor methods.
author andrew.victor@mxit.com
date Fri, 26 Aug 2011 20:04:35 +0000
parents e2c6e4fc3c84
children 0eee1b13ec2b
comparison
equal deleted inserted replaced
31968:ff051a32e1e8 31969:a2febd62ec3d
35 #include "gtkft.h" 35 #include "gtkft.h"
36 #include "prefs.h" 36 #include "prefs.h"
37 #include "pidginstock.h" 37 #include "pidginstock.h"
38 #include "gtkutils.h" 38 #include "gtkutils.h"
39 39
40 #define PIDGINXFER(xfer) \
41 (PidginXferUiData *)(xfer)->ui_data
42
43 /* the maximum size of files we will try to make a thumbnail for */ 40 /* the maximum size of files we will try to make a thumbnail for */
44 #define PIDGIN_XFER_MAX_SIZE_IMAGE_THUMBNAIL 10 * 1024 * 1024 41 #define PIDGIN_XFER_MAX_SIZE_IMAGE_THUMBNAIL 10 * 1024 * 1024
45 42
46 struct _PidginXferDialog 43 struct _PidginXferDialog
47 { 44 {
241 char *status, *utf8; 238 char *status, *utf8;
242 239
243 if (dialog == NULL || xfer == NULL) 240 if (dialog == NULL || xfer == NULL)
244 return; 241 return;
245 242
246 data = PIDGINXFER(xfer); 243 data = purple_xfer_get_ui_data(xfer);
247 244
248 get_xfer_info_strings(xfer, &kbsec, &time_elapsed, &time_remaining); 245 get_xfer_info_strings(xfer, &kbsec, &time_elapsed, &time_remaining);
249 246
250 status = g_strdup_printf("%d%% (%" G_GSIZE_FORMAT " of %" G_GSIZE_FORMAT " bytes)", 247 status = g_strdup_printf("%d%% (%" G_GSIZE_FORMAT " of %" G_GSIZE_FORMAT " bytes)",
251 (int)(purple_xfer_get_progress(xfer)*100), 248 (int)(purple_xfer_get_progress(xfer)*100),
867 g_return_if_fail(dialog != NULL); 864 g_return_if_fail(dialog != NULL);
868 g_return_if_fail(xfer != NULL); 865 g_return_if_fail(xfer != NULL);
869 866
870 purple_xfer_ref(xfer); 867 purple_xfer_ref(xfer);
871 868
872 data = PIDGINXFER(xfer); 869 data = purple_xfer_get_ui_data(xfer);
873 data->in_list = TRUE; 870 data->in_list = TRUE;
874 871
875 pidgin_xfer_dialog_show(dialog); 872 pidgin_xfer_dialog_show(dialog);
876 873
877 data->last_updated_time = 0; 874 data->last_updated_time = 0;
924 PidginXferUiData *data; 921 PidginXferUiData *data;
925 922
926 g_return_if_fail(dialog != NULL); 923 g_return_if_fail(dialog != NULL);
927 g_return_if_fail(xfer != NULL); 924 g_return_if_fail(xfer != NULL);
928 925
929 data = PIDGINXFER(xfer); 926 data = purple_xfer_get_ui_data(xfer);
930 927
931 if (data == NULL) 928 if (data == NULL)
932 return; 929 return;
933 930
934 if (!data->in_list) 931 if (!data->in_list)
955 const gchar *status; 952 const gchar *status;
956 953
957 g_return_if_fail(dialog != NULL); 954 g_return_if_fail(dialog != NULL);
958 g_return_if_fail(xfer != NULL); 955 g_return_if_fail(xfer != NULL);
959 956
960 data = PIDGINXFER(xfer); 957 data = purple_xfer_get_ui_data(xfer);
961 958
962 if (data == NULL) 959 if (data == NULL)
963 return; 960 return;
964 961
965 if (!data->in_list) 962 if (!data->in_list)
968 if ((purple_xfer_get_status(xfer) == PURPLE_XFER_STATUS_CANCEL_LOCAL) && (dialog->auto_clear)) { 965 if ((purple_xfer_get_status(xfer) == PURPLE_XFER_STATUS_CANCEL_LOCAL) && (dialog->auto_clear)) {
969 pidgin_xfer_dialog_remove_xfer(dialog, xfer); 966 pidgin_xfer_dialog_remove_xfer(dialog, xfer);
970 return; 967 return;
971 } 968 }
972 969
973 data = PIDGINXFER(xfer); 970 data = purple_xfer_get_ui_data(xfer);
974 971
975 update_detailed_info(dialog, xfer); 972 update_detailed_info(dialog, xfer);
976 update_title_progress(dialog); 973 update_title_progress(dialog);
977 974
978 pixbuf = gtk_widget_render_icon(dialog->window, 975 pixbuf = gtk_widget_render_icon(dialog->window,
1005 gboolean valid; 1002 gboolean valid;
1006 1003
1007 g_return_if_fail(dialog != NULL); 1004 g_return_if_fail(dialog != NULL);
1008 g_return_if_fail(xfer != NULL); 1005 g_return_if_fail(xfer != NULL);
1009 1006
1010 if ((data = PIDGINXFER(xfer)) == NULL) 1007 if ((data = purple_xfer_get_ui_data(xfer)) == NULL)
1011 return; 1008 return;
1012 1009
1013 if (data->in_list == FALSE) 1010 if (data->in_list == FALSE)
1014 return; 1011 return;
1015 1012
1093 static void 1090 static void
1094 pidgin_xfer_new_xfer(PurpleXfer *xfer) 1091 pidgin_xfer_new_xfer(PurpleXfer *xfer)
1095 { 1092 {
1096 PidginXferUiData *data; 1093 PidginXferUiData *data;
1097 1094
1098 /* This is where we're setting xfer->ui_data for the first time. */ 1095 /* This is where we're setting xfer's "ui_data" for the first time. */
1099 data = g_new0(PidginXferUiData, 1); 1096 data = g_new0(PidginXferUiData, 1);
1100 xfer->ui_data = data; 1097 purple_xfer_set_ui_data(xfer, data);
1101 } 1098 }
1102 1099
1103 static void 1100 static void
1104 pidgin_xfer_destroy(PurpleXfer *xfer) 1101 pidgin_xfer_destroy(PurpleXfer *xfer)
1105 { 1102 {
1106 PidginXferUiData *data; 1103 PidginXferUiData *data;
1107 1104
1108 data = PIDGINXFER(xfer); 1105 data = purple_xfer_get_ui_data(xfer);
1109 if (data) { 1106 if (data) {
1110 g_free(data->name); 1107 g_free(data->name);
1111 g_free(data); 1108 g_free(data);
1112 xfer->ui_data = NULL; 1109 purple_xfer_set_ui_data(xfer, NULL);
1113 } 1110 }
1114 } 1111 }
1115 1112
1116 static void 1113 static void
1117 pidgin_xfer_add_xfer(PurpleXfer *xfer) 1114 pidgin_xfer_add_xfer(PurpleXfer *xfer)