# HG changeset patch # User Mark Doliner # Date 1113885793 0 # Node ID fa06fda628689fd89ed35c79095b2797b2c0d6c6 # Parent c203cd637f95f2f070d4428e0938261149ef9fb5 [gaim-migrate @ 12522] GET OUTTA MY HOUSE!!! Thanks to Gary for showing me a list of non-namespaced stuff. I'm sure I missed some. committer: Tailor Script diff -r c203cd637f95 -r fa06fda62868 src/blist.c --- a/src/blist.c Tue Apr 19 04:21:39 2005 +0000 +++ b/src/blist.c Tue Apr 19 04:43:13 2005 +0000 @@ -142,7 +142,7 @@ xmlnode_insert_data(child, data, -1); } -xmlnode * +static xmlnode * buddy_to_xmlnode(GaimBlistNode *bnode) { xmlnode *node, *child; @@ -169,7 +169,7 @@ return node; } -xmlnode * +static xmlnode * contact_to_xmlnode(GaimBlistNode *cnode) { xmlnode *node, *child; @@ -203,7 +203,7 @@ return node; } -xmlnode * +static xmlnode * chat_to_xmlnode(GaimBlistNode *cnode) { xmlnode *node, *child; @@ -230,7 +230,7 @@ return node; } -xmlnode * +static xmlnode * group_to_xmlnode(GaimBlistNode *gnode) { xmlnode *node, *child; @@ -265,7 +265,7 @@ return node; } -xmlnode * +static xmlnode * accountprivacy_to_xmlnode(GaimAccount *account) { xmlnode *node, *child; @@ -293,7 +293,7 @@ return node; } -xmlnode * +static xmlnode * blist_to_xmlnode() { xmlnode *node, *child, *grandchild; diff -r c203cd637f95 -r fa06fda62868 src/gtkblist.c --- a/src/gtkblist.c Tue Apr 19 04:21:39 2005 +0000 +++ b/src/gtkblist.c Tue Apr 19 04:43:13 2005 +0000 @@ -152,11 +152,11 @@ SOUTH_SIDE }; -const double shadow_strip_l[5] = { +static const double shadow_strip_l[5] = { .937, .831, .670, .478, .180 }; -const double bottom_left_corner[25] = { +static const double bottom_left_corner[25] = { 1.00, .682, .423, .333, .258, 1.00, .898, .800, .682, .584, 1.00, .937, .874, .800, .737, @@ -164,7 +164,7 @@ 1.00, .988, .976, .960, .945 }; -const double bottom_right_corner[25] = { +static const double bottom_right_corner[25] = { .258, .584, .737, .866, .945, .584, .682, .800, .898, .960, .737, .800, .874, .937, .976, @@ -172,7 +172,7 @@ .945, .960, .976, .988, .996 }; -const double top_right_corner[25] = { +static const double top_right_corner[25] = { 1.00, 1.00, 1.00, 1.00, 1.00, .686, .898, .937, .968, .988, .423, .803, .874, .937, .976, @@ -180,7 +180,7 @@ .258, .584, .737, .866, .945 }; -const double top_left_corner[25] = { +static const double top_left_corner[25] = { .988, .968, .937, .898, .498, .976, .937, .874, .803, .423, .960, .898, .800, .686, .333, diff -r c203cd637f95 -r fa06fda62868 src/gtkconn.c --- a/src/gtkconn.c Tue Apr 19 04:21:39 2005 +0000 +++ b/src/gtkconn.c Tue Apr 19 04:43:13 2005 +0000 @@ -91,7 +91,7 @@ GtkWidget *reconnect_btn; GtkWidget *reconnectall_btn; }; -struct disconnect_window *disconnect_window = NULL; +static struct disconnect_window *disconnect_window = NULL; static void disconnect_connection_change_cb(GaimConnection *gc, void *data); @@ -486,39 +486,3 @@ { return &conn_ui_ops; } - -/* - * This function needs to be moved out of here once away messages are - * core/UI split. - */ -void away_on_login(const char *mesg) -{ -#if 0 /* XXX CORE/UI */ - GSList *awy = away_messages; - struct away_message *a, *message = NULL; - GaimGtkBuddyList *gtkblist; - - gtkblist = GAIM_GTK_BLIST(gaim_get_blist()); - - if (!gtkblist->window) { - return; - } - - if (mesg == NULL) - mesg = gaim_prefs_get_string("/core/away/default_message"); - while (awy) { - a = (struct away_message *)awy->data; - if (strcmp(a->name, mesg) == 0) { - message = a; - break; - } - awy = awy->next; - } - if (message == NULL) { - if(!away_messages) - return; - message = away_messages->data; - } - do_away_message(NULL, message); -#endif -} diff -r c203cd637f95 -r fa06fda62868 src/gtkprefs.c --- a/src/gtkprefs.c Tue Apr 19 04:21:39 2005 +0000 +++ b/src/gtkprefs.c Tue Apr 19 04:43:13 2005 +0000 @@ -660,7 +660,9 @@ return ret; } -GtkWidget *theme_page() { +static GtkWidget * +theme_page() +{ GtkWidget *ret; GtkWidget *sw; GtkWidget *view; @@ -804,7 +806,9 @@ } } -GtkWidget *messages_page() { +static GtkWidget * +messages_page() +{ GtkWidget *ret; GtkWidget *vbox, *fontvbox; GtkWidget *imhtml; @@ -871,7 +875,9 @@ return ret; } -GtkWidget *list_page() { +static GtkWidget * +list_page() +{ GtkWidget *ret; GtkWidget *vbox; GList *l= NULL; @@ -915,7 +921,9 @@ gtk_widget_set_sensitive(GTK_WIDGET(data), FALSE); } -GtkWidget *conv_page() { +static GtkWidget * +conv_page() +{ GtkWidget *ret; GtkWidget *vbox, *vbox2; GtkWidget *label; @@ -1010,7 +1018,9 @@ gaim_prefs_set_string("/core/proxy/password", gtk_entry_get_text(entry)); } -GtkWidget *network_page() { +static GtkWidget * +network_page() +{ GtkWidget *ret; GtkWidget *vbox, *hbox, *entry; GtkWidget *table, *label, *auto_ip_checkbox, *ports_checkbox, *spin_button; @@ -1252,7 +1262,9 @@ gtk_widget_set_sensitive(hbox, !strcmp(browser, "custom")); } -GtkWidget *browser_page() { +static GtkWidget * +browser_page() +{ GtkWidget *ret; GtkWidget *vbox; GtkWidget *hbox; @@ -1321,7 +1333,9 @@ } #endif /*_WIN32*/ -GtkWidget *logging_page() { +static GtkWidget * +logging_page() +{ GtkWidget *ret; GtkWidget *vbox; GList *names; @@ -1526,7 +1540,9 @@ g_value_unset (&val); } -GtkWidget *sound_page() { +static GtkWidget * +sound_page() +{ GtkWidget *ret; GtkWidget *vbox, *sw, *button; GtkSizeGroup *sg; @@ -1738,7 +1754,9 @@ } #endif -GtkWidget *away_page() { +static GtkWidget * +away_page() +{ GtkWidget *ret; GtkWidget *vbox; GtkWidget *hbox; diff -r c203cd637f95 -r fa06fda62868 src/gtkutils.c --- a/src/gtkutils.c Tue Apr 19 04:21:39 2005 +0000 +++ b/src/gtkutils.c Tue Apr 19 04:43:13 2005 +0000 @@ -59,7 +59,7 @@ #include "gtkimhtmltoolbar.h" #include "gtkutils.h" -guint accels_save_timer = 0; +static guint accels_save_timer = 0; static gboolean url_clicked_idle_cb(gpointer data) @@ -1361,21 +1361,21 @@ char *who; } _DndData; -void dnd_set_icon_ok_cb(_DndData *data) +static void dnd_set_icon_ok_cb(_DndData *data) { free(data->filename); free(data->who); free(data); } -void dnd_set_icon_cancel_cb(_DndData *data) +static void dnd_set_icon_cancel_cb(_DndData *data) { free(data->filename); free(data->who); free (data); } -void dnd_image_ok_callback(_DndData *data, int choice) +static void dnd_image_ok_callback(_DndData *data, int choice) { char *filedata; size_t size; @@ -1440,7 +1440,7 @@ free(data); } -void dnd_image_cancel_callback(_DndData *data, int choice) +static void dnd_image_cancel_callback(_DndData *data, int choice) { free(data->filename); free(data->who); diff -r c203cd637f95 -r fa06fda62868 src/prefs.c --- a/src/prefs.c Tue Apr 19 04:21:39 2005 +0000 +++ b/src/prefs.c Tue Apr 19 04:43:13 2005 +0000 @@ -104,7 +104,7 @@ * This function recursively creates the xmlnode tree from the prefs * tree structure. Yay recursion! */ -void +static void pref_to_xmlnode(xmlnode *parent, struct gaim_pref *pref) { xmlnode *node, *childnode; diff -r c203cd637f95 -r fa06fda62868 src/server.c --- a/src/server.c Tue Apr 19 04:21:39 2005 +0000 +++ b/src/server.c Tue Apr 19 04:43:13 2005 +0000 @@ -79,7 +79,8 @@ time_t sent; }; -gboolean expire_last_auto_responses(gpointer data) +static gboolean +expire_last_auto_responses(gpointer data) { GSList *tmp, *cur; struct last_auto_response *lar; @@ -100,7 +101,8 @@ return FALSE; /* do not run again */ } -struct last_auto_response *get_last_auto_response(GaimConnection *gc, const char *name) +static struct last_auto_response * +get_last_auto_response(GaimConnection *gc, const char *name) { GSList *tmp; struct last_auto_response *lar; @@ -129,25 +131,6 @@ return lar; } -void flush_last_auto_responses(GaimConnection *gc) -{ - GSList *tmp, *cur; - struct last_auto_response *lar; - - tmp = last_auto_responses; - - while (tmp) { - cur = tmp; - tmp = tmp->next; - lar = (struct last_auto_response *)cur->data; - - if (lar->gc == gc) { - last_auto_responses = g_slist_remove(last_auto_responses, lar); - g_free(lar); - } - } -} - int serv_send_im(GaimConnection *gc, const char *name, const char *message, GaimConvImFlags imflags) {