Menu
▾
▴
pidgin-commits
|
From: Mark D. <the...@us...> - 2005-04-25 04:22:39
|
Update of /cvsroot/gaim/gaim/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31648/src Modified Files: gtkdnd-hints.c gtkimhtml.c gtkmain.c gtkprefs.c gtkrequest.c gtkstock.c gtkutils.c prefs.c server.c util.c util.h Log Message: Make a bunch of stuff static and rename set_gaim_user_dir to gaim_util_set_user_dir Index: gtkdnd-hints.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkdnd-hints.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -p -r1.1 -r1.2 --- gtkdnd-hints.c 2 Dec 2004 20:35:32 -0000 1.1 +++ gtkdnd-hints.c 25 Apr 2005 04:22:11 -0000 1.2 @@ -45,7 +45,7 @@ typedef struct /** * Info about each hint widget. See DndHintWindowId enum. */ -HintWindowInfo hint_windows[] = { +static HintWindowInfo hint_windows[] = { { NULL, "tb_drag_arrow_up.xpm", -13/2, 0 }, { NULL, "tb_drag_arrow_down.xpm", -13/2, -16 }, { NULL, "tb_drag_arrow_left.xpm", 0, -13/2 }, Index: gtkimhtml.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v retrieving revision 1.420 retrieving revision 1.421 diff -u -d -p -r1.420 -r1.421 --- gtkimhtml.c 24 Apr 2005 21:28:39 -0000 1.420 +++ gtkimhtml.c 25 Apr 2005 04:22:11 -0000 1.421 @@ -121,14 +121,14 @@ enum { }; static guint signals [LAST_SIGNAL] = { 0 }; -GtkTargetEntry selection_targets[] = { +static GtkTargetEntry selection_targets[] = { { "text/html", 0, TARGET_HTML }, { "UTF8_STRING", 0, TARGET_UTF8_STRING }, { "COMPOUND_TEXT", 0, TARGET_COMPOUND_TEXT }, { "STRING", 0, TARGET_STRING }, { "TEXT", 0, TARGET_TEXT}}; -GtkTargetEntry link_drag_drop_targets[] = { +static GtkTargetEntry link_drag_drop_targets[] = { GTK_IMHTML_DND_TARGETS }; @@ -1370,7 +1370,7 @@ static void url_copy(GtkWidget *w, gchar } /* The callback for an event on a link tag. */ -gboolean tag_event(GtkTextTag *tag, GObject *imhtml, GdkEvent *event, GtkTextIter *arg2, gpointer unused) { +static gboolean tag_event(GtkTextTag *tag, GObject *imhtml, GdkEvent *event, GtkTextIter *arg2, gpointer unused) { GdkEventButton *event_button = (GdkEventButton *) event; if (GTK_IMHTML(imhtml)->editable) return FALSE; @@ -2206,7 +2206,7 @@ void gtk_imhtml_append_text_with_images #define MAX_SCROLL_TIME 0.4 -gboolean scroll_cb(gpointer data) +static gboolean scroll_cb(gpointer data) { GtkIMHtml *imhtml = data; GtkAdjustment *adj = GTK_TEXT_VIEW(imhtml)->vadjustment; @@ -2231,7 +2231,7 @@ gboolean scroll_cb(gpointer data) return TRUE; } -gboolean scroll_idle_cb(gpointer data) +static gboolean scroll_idle_cb(gpointer data) { GtkIMHtml *imhtml = data; imhtml->scroll_src = g_timeout_add(33, scroll_cb, imhtml); Index: gtkmain.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkmain.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -p -r1.25 -r1.26 --- gtkmain.c 12 Apr 2005 02:33:27 -0000 1.25 +++ gtkmain.c 25 Apr 2005 04:22:11 -0000 1.26 @@ -145,7 +145,7 @@ clean_pid(void) } } -void +static void sighandler(int sig) { switch (sig) { @@ -593,7 +593,7 @@ int main(int argc, char *argv[]) /* set a user-specified config directory */ if (opt_config_dir_arg != NULL) { - set_gaim_user_dir(opt_config_dir_arg); + gaim_util_set_user_dir(opt_config_dir_arg); } /* Index: gtkprefs.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkprefs.c,v retrieving revision 1.256 retrieving revision 1.257 diff -u -d -p -r1.256 -r1.257 --- gtkprefs.c 24 Apr 2005 17:39:11 -0000 1.256 +++ gtkprefs.c 25 Apr 2005 04:22:11 -0000 1.257 @@ -463,7 +463,7 @@ static void smiley_sel (GtkTreeSelection g_value_unset (&val); } -GtkTreePath *theme_refresh_theme_list() +static GtkTreePath *theme_refresh_theme_list() { GdkPixbuf *pixbuf; GSList *themes; @@ -518,7 +518,7 @@ GtkTreePath *theme_refresh_theme_list() return path; } -void theme_install_theme(char *path, char *extn) { +static void theme_install_theme(char *path, char *extn) { #ifndef _WIN32 gchar *command, *escaped; #endif @@ -585,7 +585,7 @@ theme_got_url(void *data, const char *th g_free(path); } -void theme_dnd_recv(GtkWidget *widget, GdkDragContext *dc, guint x, guint y, GtkSelectionData *sd, +static void theme_dnd_recv(GtkWidget *widget, GdkDragContext *dc, guint x, guint y, GtkSelectionData *sd, guint info, guint t, gpointer data) { gchar *name = sd->data; @@ -2109,7 +2109,7 @@ int prefs_notebook_add_page(const char * return gtk_notebook_append_page(GTK_NOTEBOOK(prefsnotebook), page, gtk_label_new(text)); } -void prefs_notebook_init() { +static void prefs_notebook_init() { GtkTreeIter p, c, c2; GList *l; prefs_notebook_add_page(_("Buddy List"), NULL, list_page(), &c, &p, notebook_page++); Index: gtkrequest.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkrequest.c,v retrieving revision 1.97 retrieving revision 1.98 diff -u -d -p -r1.97 -r1.98 --- gtkrequest.c 7 Apr 2005 15:22:21 -0000 1.97 +++ gtkrequest.c 25 Apr 2005 04:22:11 -0000 1.98 @@ -646,7 +646,7 @@ req_entry_field_changed_cb(GtkWidget *en gaim_request_fields_all_required_filled(field->group->fields_list)); } -GList * +static GList * get_online_names(void) { GList *names = NULL; Index: gtkstock.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkstock.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -p -r1.2 -r1.3 --- gtkstock.c 27 Feb 2005 08:35:11 -0000 1.2 +++ gtkstock.c 25 Apr 2005 04:22:12 -0000 1.3 @@ -95,7 +95,7 @@ static struct StockIcon { GAIM_STOCK_WARN, NULL, GTK_STOCK_DIALOG_WARNING } }; -const GtkStockItem stock_items[] = +static const GtkStockItem stock_items[] = { { GAIM_STOCK_ALIAS, N_("_Alias"), 0, 0, NULL }, { GAIM_STOCK_CHAT, N_("_Join"), 0, 0, NULL }, Index: gtkutils.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkutils.c,v retrieving revision 1.108 retrieving revision 1.109 diff -u -d -p -r1.108 -r1.109 --- gtkutils.c 19 Apr 2005 04:43:12 -0000 1.108 +++ gtkutils.c 25 Apr 2005 04:22:12 -0000 1.109 @@ -75,7 +75,7 @@ url_clicked_cb(GtkWidget *w, const char g_idle_add(url_clicked_idle_cb, g_strdup(uri)); } -GtkIMHtmlFuncs gtkimhtml_cbs = { +static GtkIMHtmlFuncs gtkimhtml_cbs = { (GtkIMHtmlGetImageFunc)gaim_imgstore_get, (GtkIMHtmlGetImageDataFunc)gaim_imgstore_get_data, (GtkIMHtmlGetImageSizeFunc)gaim_imgstore_get_size, Index: prefs.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/prefs.c,v retrieving revision 1.446 retrieving revision 1.447 diff -u -d -p -r1.446 -r1.447 --- prefs.c 19 Apr 2005 04:43:12 -0000 1.446 +++ prefs.c 25 Apr 2005 04:22:12 -0000 1.447 @@ -605,7 +605,7 @@ gaim_prefs_add_string_list(const char *n g_strdup(tmp->data)); } -void +static void remove_pref(struct gaim_pref *pref) { char *name; Index: server.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/server.c,v retrieving revision 1.460 retrieving revision 1.461 diff -u -d -p -r1.460 -r1.461 --- server.c 19 Apr 2005 19:48:26 -0000 1.460 +++ server.c 25 Apr 2005 04:22:12 -0000 1.461 @@ -72,7 +72,7 @@ int serv_send_typing(GaimConnection *g, return 0; } -GSList *last_auto_responses = NULL; +static GSList *last_auto_responses = NULL; struct last_auto_response { GaimConnection *gc; char name[80]; Index: util.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/util.c,v retrieving revision 1.347 retrieving revision 1.348 diff -u -d -p -r1.347 -r1.348 --- util.c 9 Apr 2005 14:12:38 -0000 1.347 +++ util.c 25 Apr 2005 04:22:29 -0000 1.348 @@ -1868,7 +1868,7 @@ gaim_user_dir(void) return home_dir; } -void set_gaim_user_dir(const char *dir) +void gaim_util_set_user_dir(const char *dir) { if (dir != NULL && strlen(dir) > 0) { g_strlcpy((char*) &custom_home_dir, dir, Index: util.h =================================================================== RCS file: /cvsroot/gaim/gaim/src/util.h,v retrieving revision 1.74 retrieving revision 1.75 diff -u -d -p -r1.74 -r1.75 --- util.h 25 Apr 2005 03:55:07 -0000 1.74 +++ util.h 25 Apr 2005 04:22:29 -0000 1.75 @@ -362,7 +362,7 @@ const char *gaim_user_dir(void); * Define a custom gaim settings directory, overriding the default (user's home directory/.gaim) * @param dir The custom settings directory */ -void set_gaim_user_dir(const char *dir); +void gaim_util_set_user_dir(const char *dir); /** * Builds a complete path from the root, making any directories along |
Thanks for helping keep SourceForge clean.
X