Mercurial > pidgin.yaz
changeset 10871:6240d7fd5b2c
[gaim-migrate @ 12558]
Make a bunch of stuff static and rename set_gaim_user_dir to
gaim_util_set_user_dir
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Mon, 25 Apr 2005 04:22:29 +0000 |
| parents | b75ce371c812 |
| children | beb62c7e9d8b |
| files | src/gtkdnd-hints.c src/gtkimhtml.c src/gtkmain.c src/gtkprefs.c src/gtkrequest.c src/gtkstock.c src/gtkutils.c src/prefs.c src/server.c src/util.c src/util.h |
| diffstat | 11 files changed, 19 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gtkdnd-hints.c Mon Apr 25 04:03:16 2005 +0000 +++ b/src/gtkdnd-hints.c Mon Apr 25 04:22:29 2005 +0000 @@ -45,7 +45,7 @@ /** * 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 },
--- a/src/gtkimhtml.c Mon Apr 25 04:03:16 2005 +0000 +++ b/src/gtkimhtml.c Mon Apr 25 04:22:29 2005 +0000 @@ -121,14 +121,14 @@ }; 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 @@ } /* 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 @@ #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 @@ 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);
--- a/src/gtkmain.c Mon Apr 25 04:03:16 2005 +0000 +++ b/src/gtkmain.c Mon Apr 25 04:22:29 2005 +0000 @@ -145,7 +145,7 @@ } } -void +static void sighandler(int sig) { switch (sig) { @@ -593,7 +593,7 @@ /* 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); } /*
--- a/src/gtkprefs.c Mon Apr 25 04:03:16 2005 +0000 +++ b/src/gtkprefs.c Mon Apr 25 04:22:29 2005 +0000 @@ -463,7 +463,7 @@ g_value_unset (&val); } -GtkTreePath *theme_refresh_theme_list() +static GtkTreePath *theme_refresh_theme_list() { GdkPixbuf *pixbuf; GSList *themes; @@ -518,7 +518,7 @@ 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 @@ 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 @@ 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++);
--- a/src/gtkrequest.c Mon Apr 25 04:03:16 2005 +0000 +++ b/src/gtkrequest.c Mon Apr 25 04:22:29 2005 +0000 @@ -646,7 +646,7 @@ gaim_request_fields_all_required_filled(field->group->fields_list)); } -GList * +static GList * get_online_names(void) { GList *names = NULL;
--- a/src/gtkstock.c Mon Apr 25 04:03:16 2005 +0000 +++ b/src/gtkstock.c Mon Apr 25 04:22:29 2005 +0000 @@ -95,7 +95,7 @@ { 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 },
--- a/src/gtkutils.c Mon Apr 25 04:03:16 2005 +0000 +++ b/src/gtkutils.c Mon Apr 25 04:22:29 2005 +0000 @@ -75,7 +75,7 @@ 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,
--- a/src/prefs.c Mon Apr 25 04:03:16 2005 +0000 +++ b/src/prefs.c Mon Apr 25 04:22:29 2005 +0000 @@ -605,7 +605,7 @@ g_strdup(tmp->data)); } -void +static void remove_pref(struct gaim_pref *pref) { char *name;
--- a/src/server.c Mon Apr 25 04:03:16 2005 +0000 +++ b/src/server.c Mon Apr 25 04:22:29 2005 +0000 @@ -72,7 +72,7 @@ return 0; } -GSList *last_auto_responses = NULL; +static GSList *last_auto_responses = NULL; struct last_auto_response { GaimConnection *gc; char name[80];
--- a/src/util.c Mon Apr 25 04:03:16 2005 +0000 +++ b/src/util.c Mon Apr 25 04:22:29 2005 +0000 @@ -1868,7 +1868,7 @@ 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,
--- a/src/util.h Mon Apr 25 04:03:16 2005 +0000 +++ b/src/util.h Mon Apr 25 04:22:29 2005 +0000 @@ -362,7 +362,7 @@ * 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