iiiypuk/hexchat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed coding style and clearified some comments, following arnavion suggestions

Browse Source
This commit is contained in:
Helder Martins 2013-07-17 09:20:54 +01:00
parent 0c87c49146
commit a8abba84bd
3 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/dcc.c
View File

@ -228,7 +228,7 @@ is_dcc (struct DCC *dcc)
} }
gboolean gboolean
is_dcc_fcompleted (struct DCC *dcc) is_dcc_completed (struct DCC *dcc)
{ {
if (dcc != NULL) if (dcc != NULL)
return (dcc->dccstat == STAT_FAILED || dcc->dccstat == STAT_DONE || dcc->dccstat == STAT_ABORTED); return (dcc->dccstat == STAT_FAILED || dcc->dccstat == STAT_DONE || dcc->dccstat == STAT_ABORTED);

2
src/common/dcc.h
View File

@ -117,7 +117,7 @@ struct dccstat_info
extern struct dccstat_info dccstat[]; extern struct dccstat_info dccstat[];
gboolean is_dcc (struct DCC *dcc); gboolean is_dcc (struct DCC *dcc);
gboolean is_dcc_fcompleted (struct DCC *dcc); gboolean is_dcc_completed (struct DCC *dcc);
void dcc_abort (session *sess, struct DCC *dcc); void dcc_abort (session *sess, struct DCC *dcc);
void dcc_get (struct DCC *dcc); void dcc_get (struct DCC *dcc);
int dcc_resume (struct DCC *dcc); int dcc_resume (struct DCC *dcc);

37
src/fe-gtk/dccgui.c
View File

@ -381,7 +381,7 @@ dcc_append (struct DCC *dcc, GtkListStore *store, gboolean prepend)
dcc_prepare_row_send (dcc, store, &iter, FALSE); dcc_prepare_row_send (dcc, store, &iter, FALSE);
} }
/* Retrives aborted, sent and received tasks of current view */ /* Returns aborted and completed transfers. */
static GSList * static GSList *
dcc_get_completed (void) dcc_get_completed (void)
{ {
@ -396,7 +396,7 @@ dcc_get_completed (void)
do do
{ {
gtk_tree_model_get (model, &iter, COL_DCC, &dcc, -1); gtk_tree_model_get (model, &iter, COL_DCC, &dcc, -1);
if (is_dcc_fcompleted (dcc)) if (is_dcc_completed (dcc))
completed = g_slist_prepend (completed, dcc); completed = g_slist_prepend (completed, dcc);
} while (gtk_tree_model_iter_next (model, &iter)); } while (gtk_tree_model_iter_next (model, &iter));
@ -406,7 +406,7 @@ dcc_get_completed (void)
} }
static gboolean static gboolean
exists_completed_tasks (void) dcc_completed_transfer_exists (void)
{ {
gboolean exist; gboolean exist;
GSList *comp_list; GSList *comp_list;
@ -466,7 +466,7 @@ dcc_fill_window (int flags)
} }
else else
{ {
gtk_widget_set_sensitive (dccfwin.clear_button, exists_completed_tasks ()); gtk_widget_set_sensitive (dccfwin.clear_button, dcc_completed_transfer_exists ());
} }
} }
@ -503,13 +503,12 @@ dcc_get_selected (void)
} }
static void static void
sensitize_clear_button (void) update_clear_button_sensitivity (void)
{ {
gboolean show = (exists_completed_tasks () && !dcc_get_selected ()); gboolean sensitive = dcc_completed_transfer_exists () && !dcc_get_selected ();
gtk_widget_set_sensitive (dccfwin.clear_button, show); gtk_widget_set_sensitive (dccfwin.clear_button, sensitive);
} }
static void static void
resume_clicked (GtkWidget * wid, gpointer none) resume_clicked (GtkWidget * wid, gpointer none)
{ {
@ -562,8 +561,8 @@ abort_clicked (GtkWidget * wid, gpointer none)
} }
g_slist_free (start); g_slist_free (start);
/* putting it here avoids redudant calls when user presses clear button*/ /* Enable the clear button if it wasn't already enabled */
sensitize_clear_button (); update_clear_button_sensitivity ();
} }
static void static void
@ -582,17 +581,17 @@ accept_clicked (GtkWidget * wid, gpointer none)
g_slist_free (start); g_slist_free (start);
} }
static void static void
clear_completed (GtkWidget * wid, gpointer none) clear_completed (GtkWidget * wid, gpointer none)
{ {
struct DCC *dcc; struct DCC *dcc;
GSList *completed = 0; GSList *completed;
/* dcc_abort may change dcc_list structure, so we need to gather the targets /* Make a new list of only the completed items and abort each item.
first. This way, we assume nothing about the order of items in the list (after dcc_abort)*/ * A new list is made because calling dcc_abort removes items from the original list,
completed = dcc_get_completed (); * making it impossible to iterate over that list directly.
for (; completed; completed = completed->next) */
for (completed = dcc_get_completed (); completed; completed = completed->next)
{ {
dcc = completed->data; dcc = completed->data;
dcc_abort (dcc->serv->front_session, dcc); dcc_abort (dcc->serv->front_session, dcc);
@ -600,7 +599,7 @@ clear_completed (GtkWidget * wid, gpointer none)
/* The data was freed by dcc_close */ /* The data was freed by dcc_close */
g_slist_free (completed); g_slist_free (completed);
sensitize_clear_button (); update_clear_button_sensitivity ();
} }
static void static void
@ -665,7 +664,7 @@ dcc_row_cb (GtkTreeSelection *sel, gpointer user_data)
return; return;
} }
/* there is at least a selection, disable button... similar to banlist semantics*/ /* if a row is selected, the clear button is disabled. */
gtk_widget_set_sensitive (dccfwin.clear_button, FALSE); gtk_widget_set_sensitive (dccfwin.clear_button, FALSE);
gtk_widget_set_sensitive (dccfwin.abort_button, TRUE); gtk_widget_set_sensitive (dccfwin.abort_button, TRUE);
@ -1133,7 +1132,7 @@ fe_dcc_update (struct DCC *dcc)
dcc_update_chat (dcc); dcc_update_chat (dcc);
} }
sensitize_clear_button (); update_clear_button_sensitivity ();
} }
void void