summaryrefslogtreecommitdiff
path: root/pidgin
diff options
context:
space:
mode:
authorRichard Laager <rlaager@pidgin.im>2007-04-16 05:27:17 +0000
committerRichard Laager <rlaager@pidgin.im>2007-04-16 05:27:17 +0000
commit95d35dd314bc80c35c338b908d12f30b60d28ac0 (patch)
tree89d0766da92194475b377823a74a7bfe42da760e /pidgin
parentd95c576af6c2d771c6f962c695d57f3dfe6c7906 (diff)
downloadpidgin-95d35dd314bc80c35c338b908d12f30b60d28ac0.tar.gz
Word on the street is that we don't want things named pidginfoo_bar(), but
pidgin_foo_bar() instead.
Diffstat (limited to 'pidgin')
-rw-r--r--pidgin/gtkblist.c24
-rw-r--r--pidgin/gtkconn.c2
-rw-r--r--pidgin/gtkconv.c18
-rw-r--r--pidgin/gtkdialogs.c80
-rw-r--r--pidgin/gtkdialogs.h28
-rw-r--r--pidgin/gtkdocklet.c2
-rw-r--r--pidgin/gtkft.c68
-rw-r--r--pidgin/gtkft.h16
-rw-r--r--pidgin/gtkimhtmltoolbar.c4
-rw-r--r--pidgin/gtkmain.c2
-rw-r--r--pidgin/gtkprefs.c4
-rw-r--r--pidgin/gtkthemes.c30
-rw-r--r--pidgin/gtkthemes.h12
-rw-r--r--pidgin/gtkutils.c2
14 files changed, 146 insertions, 146 deletions
diff --git a/pidgin/gtkblist.c b/pidgin/gtkblist.c
index e529e52338..d2462967b1 100644
--- a/pidgin/gtkblist.c
+++ b/pidgin/gtkblist.c
@@ -279,7 +279,7 @@ static void gtk_blist_menu_info_cb(GtkWidget *w, PurpleBuddy *b)
static void gtk_blist_menu_im_cb(GtkWidget *w, PurpleBuddy *b)
{
- pidgindialogs_im_with_user(b->account, b->name);
+ pidgin_dialogs_im_with_user(b->account, b->name);
}
static void gtk_blist_menu_send_file_cb(GtkWidget *w, PurpleBuddy *b)
@@ -355,7 +355,7 @@ static void gtk_blist_renderer_edited_cb(GtkCellRendererText *text_rend, char *a
case PURPLE_BLIST_GROUP_NODE:
dest = purple_find_group(arg2);
if (dest != NULL && strcmp(arg2, ((PurpleGroup*) node)->name)) {
- pidgindialogs_merge_groups((PurpleGroup*) node, arg2);
+ pidgin_dialogs_merge_groups((PurpleGroup*) node, arg2);
} else
purple_blist_rename_group((PurpleGroup*)node, arg2);
break;
@@ -831,7 +831,7 @@ static void gtk_blist_row_activated_cb(GtkTreeView *tv, GtkTreePath *path, GtkTr
else
buddy = (PurpleBuddy*)node;
- pidgindialogs_im_with_user(buddy->account, buddy->name);
+ pidgin_dialogs_im_with_user(buddy->account, buddy->name);
} else if (PURPLE_BLIST_NODE_IS_CHAT(node)) {
gtk_blist_join_chat((PurpleChat *)node);
} else if (PURPLE_BLIST_NODE_IS_GROUP(node)) {
@@ -889,13 +889,13 @@ static void
pidgin_blist_remove_cb (GtkWidget *w, PurpleBlistNode *node)
{
if (PURPLE_BLIST_NODE_IS_BUDDY(node)) {
- pidgindialogs_remove_buddy((PurpleBuddy*)node);
+ pidgin_dialogs_remove_buddy((PurpleBuddy*)node);
} else if (PURPLE_BLIST_NODE_IS_CHAT(node)) {
- pidgindialogs_remove_chat((PurpleChat*)node);
+ pidgin_dialogs_remove_chat((PurpleChat*)node);
} else if (PURPLE_BLIST_NODE_IS_GROUP(node)) {
- pidgindialogs_remove_group((PurpleGroup*)node);
+ pidgin_dialogs_remove_group((PurpleGroup*)node);
} else if (PURPLE_BLIST_NODE_IS_CONTACT(node)) {
- pidgindialogs_remove_contact((PurpleContact*)node);
+ pidgin_dialogs_remove_contact((PurpleContact*)node);
}
}
@@ -2803,10 +2803,10 @@ static GtkItemFactoryEntry blist_menu[] =
{
/* Buddies menu */
{ N_("/_Buddies"), NULL, NULL, 0, "<Branch>", NULL },
- { N_("/Buddies/New Instant _Message..."), "<CTL>M", pidgindialogs_im, 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_MESSAGE_NEW },
+ { N_("/Buddies/New Instant _Message..."), "<CTL>M", pidgin_dialogs_im, 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_MESSAGE_NEW },
{ N_("/Buddies/Join a _Chat..."), "<CTL>C", pidgin_blist_joinchat_show, 0, "<Item>", NULL },
- { N_("/Buddies/Get User _Info..."), "<CTL>I", pidgindialogs_info, 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_USER_INFO },
- { N_("/Buddies/View User _Log..."), "<CTL>L", pidgindialogs_log, 0, "<Item>", NULL },
+ { N_("/Buddies/Get User _Info..."), "<CTL>I", pidgin_dialogs_info, 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_USER_INFO },
+ { N_("/Buddies/View User _Log..."), "<CTL>L", pidgin_dialogs_log, 0, "<Item>", NULL },
{ "/Buddies/sep1", NULL, NULL, 0, "<Separator>", NULL },
{ N_("/Buddies/Show _Offline Buddies"), NULL, pidgin_blist_edit_mode_cb, 1, "<CheckItem>", NULL },
{ N_("/Buddies/Show _Empty Groups"), NULL, pidgin_blist_show_empty_groups_cb, 1, "<CheckItem>", NULL },
@@ -2831,7 +2831,7 @@ static GtkItemFactoryEntry blist_menu[] =
{ N_("/Tools/Pr_eferences"), "<CTL>P", pidgin_prefs_show, 0, "<StockItem>", GTK_STOCK_PREFERENCES },
{ N_("/Tools/Pr_ivacy"), NULL, pidgin_privacy_dialog_show, 0, "<Item>", NULL },
{ "/Tools/sep2", NULL, NULL, 0, "<Separator>", NULL },
- { N_("/Tools/_File Transfers"), "<CTL>T", pidginxfer_dialog_show, 0, "<Item>", NULL },
+ { N_("/Tools/_File Transfers"), "<CTL>T", pidgin_xfer_dialog_show, 0, "<Item>", NULL },
{ N_("/Tools/R_oom List"), NULL, pidgin_roomlist_dialog_show, 0, "<Item>", NULL },
{ N_("/Tools/System _Log"), NULL, gtk_blist_show_systemlog_cb, 0, "<Item>", NULL },
{ "/Tools/sep3", NULL, NULL, 0, "<Separator>", NULL },
@@ -2841,7 +2841,7 @@ static GtkItemFactoryEntry blist_menu[] =
{ N_("/_Help"), NULL, NULL, 0, "<Branch>", NULL },
{ N_("/Help/Online _Help"), "F1", gtk_blist_show_onlinehelp_cb, 0, "<StockItem>", GTK_STOCK_HELP },
{ N_("/Help/_Debug Window"), NULL, toggle_debug, 0, "<Item>", NULL },
- { N_("/Help/_About"), NULL, pidgindialogs_about, 0, "<StockItem>", PIDGIN_STOCK_ABOUT },
+ { N_("/Help/_About"), NULL, pidgin_dialogs_about, 0, "<StockItem>", PIDGIN_STOCK_ABOUT },
};
/*********************************************************
diff --git a/pidgin/gtkconn.c b/pidgin/gtkconn.c
index 1437c0efbc..f01581b827 100644
--- a/pidgin/gtkconn.c
+++ b/pidgin/gtkconn.c
@@ -96,7 +96,7 @@ pidgin_connection_disconnected(PurpleConnection *gc)
if (purple_connections_get_all() != NULL)
return;
- pidgindialogs_destroy_all();
+ pidgin_dialogs_destroy_all();
}
static void
diff --git a/pidgin/gtkconv.c b/pidgin/gtkconv.c
index 1821368c9c..9485f4b1ff 100644
--- a/pidgin/gtkconv.c
+++ b/pidgin/gtkconv.c
@@ -626,7 +626,7 @@ add_remove_cb(GtkWidget *widget, PidginConversation *gtkconv)
b = purple_find_buddy(account, name);
if (b != NULL)
- pidgindialogs_remove_buddy(b);
+ pidgin_dialogs_remove_buddy(b);
else if (account != NULL && purple_account_is_connected(account))
purple_blist_request_add_buddy(account, (char *)name, NULL, NULL);
} else if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT) {
@@ -634,7 +634,7 @@ add_remove_cb(GtkWidget *widget, PidginConversation *gtkconv)
c = purple_blist_find_chat(account, name);
if (c != NULL)
- pidgindialogs_remove_chat(c);
+ pidgin_dialogs_remove_chat(c);
else if (account != NULL && purple_account_is_connected(account))
purple_blist_request_add_chat(account, NULL, NULL, name);
}
@@ -968,7 +968,7 @@ invite_cb(GtkWidget *widget, PidginConversation *gtkconv)
static void
menu_new_conv_cb(gpointer data, guint action, GtkWidget *widget)
{
- pidgindialogs_im();
+ pidgin_dialogs_im();
}
static void
@@ -1239,13 +1239,13 @@ menu_alias_cb(gpointer data, guint action, GtkWidget *widget)
b = purple_find_buddy(account, name);
if (b != NULL)
- pidgindialogs_alias_buddy(b);
+ pidgin_dialogs_alias_buddy(b);
} else if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT) {
PurpleChat *c;
c = purple_blist_find_chat(account, name);
if (c != NULL)
- pidgindialogs_alias_chat(c);
+ pidgin_dialogs_alias_chat(c);
}
}
@@ -1411,7 +1411,7 @@ chat_do_im(PidginConversation *gtkconv, const char *who)
if(!real_who)
return;
- pidgindialogs_im_with_user(account, real_who);
+ pidgin_dialogs_im_with_user(account, real_who);
g_free(real_who);
}
@@ -1526,7 +1526,7 @@ menu_chat_add_remove_cb(GtkWidget *w, PidginConversation *gtkconv)
b = purple_find_buddy(account, name);
if (b != NULL)
- pidgindialogs_remove_buddy(b);
+ pidgin_dialogs_remove_buddy(b);
else if (account != NULL && purple_account_is_connected(account))
purple_blist_request_add_buddy(account, name, NULL, NULL);
@@ -5697,7 +5697,7 @@ pidgin_conv_custom_smiley_add(PurpleConversation *conv, const char *smile, gbool
}
/* If smileys are off, return false */
- if (pidginthemes_smileys_disabled())
+ if (pidgin_themes_smileys_disabled())
return FALSE;
/* If possible add this smiley to the current theme.
@@ -6024,7 +6024,7 @@ pidgin_conv_update_fields(PurpleConversation *conv, PidginConvFields fields)
}
if (fields & PIDGIN_CONV_SMILEY_THEME)
- pidginthemes_smiley_themeize(PIDGIN_CONVERSATION(conv)->imhtml);
+ pidgin_themes_smiley_themeize(PIDGIN_CONVERSATION(conv)->imhtml);
if ((fields & PIDGIN_CONV_COLORIZE_TITLE) ||
(fields & PIDGIN_CONV_SET_TITLE))
diff --git a/pidgin/gtkdialogs.c b/pidgin/gtkdialogs.c
index 4dc5cf810d..6458f433ea 100644
--- a/pidgin/gtkdialogs.c
+++ b/pidgin/gtkdialogs.c
@@ -246,7 +246,7 @@ static struct artist artists[] = {
};
void
-pidgindialogs_destroy_all()
+pidgin_dialogs_destroy_all()
{
while (dialogwindows) {
gtk_widget_destroy(dialogwindows->data);
@@ -299,7 +299,7 @@ pidgin_logo_versionize(GdkPixbuf **original, GtkWidget *widget) {
g_object_unref(G_OBJECT(pixmap));
}
-void pidgindialogs_about()
+void pidgin_dialogs_about()
{
GtkWidget *hbox;
GtkWidget *vbox;
@@ -674,7 +674,7 @@ g_string_append(str, "<br/> <b>Library Support</b><br/>");
}
static void
-pidgindialogs_im_cb(gpointer data, PurpleRequestFields *fields)
+pidgin_dialogs_im_cb(gpointer data, PurpleRequestFields *fields)
{
PurpleAccount *account;
const char *username;
@@ -682,11 +682,11 @@ pidgindialogs_im_cb(gpointer data, PurpleRequestFields *fields)
account = purple_request_fields_get_account(fields, "account");
username = purple_request_fields_get_string(fields, "screenname");
- pidgindialogs_im_with_user(account, username);
+ pidgin_dialogs_im_with_user(account, username);
}
void
-pidgindialogs_im(void)
+pidgin_dialogs_im(void)
{
PurpleRequestFields *fields;
PurpleRequestFieldGroup *group;
@@ -715,13 +715,13 @@ pidgindialogs_im(void)
_("Please enter the screen name or alias of the person "
"you would like to IM."),
fields,
- _("OK"), G_CALLBACK(pidgindialogs_im_cb),
+ _("OK"), G_CALLBACK(pidgin_dialogs_im_cb),
_("Cancel"), NULL,
NULL);
}
void
-pidgindialogs_im_with_user(PurpleAccount *account, const char *username)
+pidgin_dialogs_im_with_user(PurpleAccount *account, const char *username)
{
PurpleConversation *conv;
@@ -737,7 +737,7 @@ pidgindialogs_im_with_user(PurpleAccount *account, const char *username)
}
static gboolean
-pidgindialogs_ee(const char *ee)
+pidgin_dialogs_ee(const char *ee)
{
GtkWidget *window;
GtkWidget *hbox;
@@ -802,7 +802,7 @@ pidgindialogs_ee(const char *ee)
}
static void
-pidgindialogs_info_cb(gpointer data, PurpleRequestFields *fields)
+pidgin_dialogs_info_cb(gpointer data, PurpleRequestFields *fields)
{
char *username;
gboolean found = FALSE;
@@ -814,7 +814,7 @@ pidgindialogs_info_cb(gpointer data, PurpleRequestFields *fields)
purple_request_fields_get_string(fields, "screenname")));
if (username != NULL && purple_str_has_suffix(username, "rocksmyworld"))
- found = pidgindialogs_ee(username);
+ found = pidgin_dialogs_ee(username);
if (!found && username != NULL && *username != '\0' && account != NULL)
serv_get_info(purple_account_get_connection(account), username);
@@ -823,7 +823,7 @@ pidgindialogs_info_cb(gpointer data, PurpleRequestFields *fields)
}
void
-pidgindialogs_info(void)
+pidgin_dialogs_info(void)
{
PurpleRequestFields *fields;
PurpleRequestFieldGroup *group;
@@ -852,13 +852,13 @@ pidgindialogs_info(void)
_("Please enter the screen name or alias of the person "
"whose info you would like to view."),
fields,
- _("OK"), G_CALLBACK(pidgindialogs_info_cb),
+ _("OK"), G_CALLBACK(pidgin_dialogs_info_cb),
_("Cancel"), NULL,
NULL);
}
static void
-pidgindialogs_log_cb(gpointer data, PurpleRequestFields *fields)
+pidgin_dialogs_log_cb(gpointer data, PurpleRequestFields *fields)
{
char *username;
PurpleAccount *account;
@@ -903,7 +903,7 @@ pidgindialogs_log_cb(gpointer data, PurpleRequestFields *fields)
* TODO - This needs to deal with logs of all types, not just IM logs.
*/
void
-pidgindialogs_log(void)
+pidgin_dialogs_log(void)
{
PurpleRequestFields *fields;
PurpleRequestFieldGroup *group;
@@ -943,38 +943,38 @@ pidgindialogs_log(void)
_("Please enter the screen name or alias of the person "
"whose log you would like to view."),
fields,
- _("OK"), G_CALLBACK(pidgindialogs_log_cb),
+ _("OK"), G_CALLBACK(pidgin_dialogs_log_cb),
_("Cancel"), NULL,
NULL);
}
static void
-pidgindialogs_alias_contact_cb(PurpleContact *contact, const char *new_alias)
+pidgin_dialogs_alias_contact_cb(PurpleContact *contact, const char *new_alias)
{
purple_contact_set_alias(contact, new_alias);
}
void
-pidgindialogs_alias_contact(PurpleContact *contact)
+pidgin_dialogs_alias_contact(PurpleContact *contact)
{
g_return_if_fail(contact != NULL);
purple_request_input(NULL, _("Alias Contact"), NULL,
_("Enter an alias for this contact."),
contact->alias, FALSE, FALSE, NULL,
- _("Alias"), G_CALLBACK(pidgindialogs_alias_contact_cb),
+ _("Alias"), G_CALLBACK(pidgin_dialogs_alias_contact_cb),
_("Cancel"), NULL, contact);
}
static void
-pidgindialogs_alias_buddy_cb(PurpleBuddy *buddy, const char *new_alias)
+pidgin_dialogs_alias_buddy_cb(PurpleBuddy *buddy, const char *new_alias)
{
purple_blist_alias_buddy(buddy, new_alias);
serv_alias_buddy(buddy);
}
void
-pidgindialogs_alias_buddy(PurpleBuddy *buddy)
+pidgin_dialogs_alias_buddy(PurpleBuddy *buddy)
{
gchar *secondary;
@@ -984,32 +984,32 @@ pidgindialogs_alias_buddy(PurpleBuddy *buddy)
purple_request_input(NULL, _("Alias Buddy"), NULL,
secondary, buddy->alias, FALSE, FALSE, NULL,
- _("Alias"), G_CALLBACK(pidgindialogs_alias_buddy_cb),
+ _("Alias"), G_CALLBACK(pidgin_dialogs_alias_buddy_cb),
_("Cancel"), NULL, buddy);
g_free(secondary);
}
static void
-pidgindialogs_alias_chat_cb(PurpleChat *chat, const char *new_alias)
+pidgin_dialogs_alias_chat_cb(PurpleChat *chat, const char *new_alias)
{
purple_blist_alias_chat(chat, new_alias);
}
void
-pidgindialogs_alias_chat(PurpleChat *chat)
+pidgin_dialogs_alias_chat(PurpleChat *chat)
{
g_return_if_fail(chat != NULL);
purple_request_input(NULL, _("Alias Chat"), NULL,
_("Enter an alias for this chat."),
chat->alias, FALSE, FALSE, NULL,
- _("Alias"), G_CALLBACK(pidgindialogs_alias_chat_cb),
+ _("Alias"), G_CALLBACK(pidgin_dialogs_alias_chat_cb),
_("Cancel"), NULL, chat);
}
static void
-pidgindialogs_remove_contact_cb(PurpleContact *contact)
+pidgin_dialogs_remove_contact_cb(PurpleContact *contact)
{
PurpleBlistNode *bnode, *cnode;
PurpleGroup *group;
@@ -1025,7 +1025,7 @@ pidgindialogs_remove_contact_cb(PurpleContact *contact)
}
void
-pidgindialogs_remove_contact(PurpleContact *contact)
+pidgin_dialogs_remove_contact(PurpleContact *contact)
{
PurpleBuddy *buddy = purple_contact_get_priority_buddy(contact);
@@ -1034,7 +1034,7 @@ pidgindialogs_remove_contact(PurpleContact *contact)
if (((PurpleBlistNode*)contact)->child == (PurpleBlistNode*)buddy &&
!((PurpleBlistNode*)buddy)->next) {
- pidgindialogs_remove_buddy(buddy);
+ pidgin_dialogs_remove_buddy(buddy);
} else {
gchar *text;
text = g_strdup_printf(
@@ -1048,7 +1048,7 @@ pidgindialogs_remove_contact(PurpleContact *contact)
buddy->name, contact->totalsize - 1);
purple_request_action(contact, NULL, _("Remove Contact"), text, 0, contact, 2,
- _("_Remove Contact"), G_CALLBACK(pidgindialogs_remove_contact_cb),
+ _("_Remove Contact"), G_CALLBACK(pidgin_dialogs_remove_contact_cb),
_("Cancel"), NULL);
g_free(text);
@@ -1062,14 +1062,14 @@ static void free_ggmo(struct _PidginGroupMergeObject *ggp)
}
static void
-pidgindialogs_merge_groups_cb(struct _PidginGroupMergeObject *GGP)
+pidgin_dialogs_merge_groups_cb(struct _PidginGroupMergeObject *GGP)
{
purple_blist_rename_group(GGP->parent, GGP->new_name);
free_ggmo(GGP);
}
void
-pidgindialogs_merge_groups(PurpleGroup *source, const char *new_name)
+pidgin_dialogs_merge_groups(PurpleGroup *source, const char *new_name)
{
gchar *text;
struct _PidginGroupMergeObject *ggp;
@@ -1086,14 +1086,14 @@ pidgindialogs_merge_groups(PurpleGroup *source, const char *new_name)
ggp->new_name = g_strdup(new_name);
purple_request_action(source, NULL, _("Merge Groups"), text, 0, ggp, 2,
- _("_Merge Groups"), G_CALLBACK(pidgindialogs_merge_groups_cb),
+ _("_Merge Groups"), G_CALLBACK(pidgin_dialogs_merge_groups_cb),
_("Cancel"), G_CALLBACK(free_ggmo));
g_free(text);
}
static void
-pidgindialogs_remove_group_cb(PurpleGroup *group)
+pidgin_dialogs_remove_group_cb(PurpleGroup *group)
{
PurpleBlistNode *cnode, *bnode;
@@ -1130,7 +1130,7 @@ pidgindialogs_remove_group_cb(PurpleGroup *group)
}
void
-pidgindialogs_remove_group(PurpleGroup *group)
+pidgin_dialogs_remove_group(PurpleGroup *group)
{
gchar *text;
@@ -1140,7 +1140,7 @@ pidgindialogs_remove_group(PurpleGroup *group)
group->name);
purple_request_action(group, NULL, _("Remove Group"), text, 0, group, 2,
- _("_Remove Group"), G_CALLBACK(pidgindialogs_remove_group_cb),
+ _("_Remove Group"), G_CALLBACK(pidgin_dialogs_remove_group_cb),
_("Cancel"), NULL);
g_free(text);
@@ -1148,7 +1148,7 @@ pidgindialogs_remove_group(PurpleGroup *group)
/* XXX - Some of this should be moved into the core, methinks. */
static void
-pidgindialogs_remove_buddy_cb(PurpleBuddy *buddy)
+pidgin_dialogs_remove_buddy_cb(PurpleBuddy *buddy)
{
PurpleGroup *group;
gchar *name;
@@ -1167,7 +1167,7 @@ pidgindialogs_remove_buddy_cb(PurpleBuddy *buddy)
}
void
-pidgindialogs_remove_buddy(PurpleBuddy *buddy)
+pidgin_dialogs_remove_buddy(PurpleBuddy *buddy)
{
gchar *text;
@@ -1177,20 +1177,20 @@ pidgindialogs_remove_buddy(PurpleBuddy *buddy)
buddy->name);
purple_request_action(buddy, NULL, _("Remove Buddy"), text, 0, buddy, 2,
- _("_Remove Buddy"), G_CALLBACK(pidgindialogs_remove_buddy_cb),
+ _("_Remove Buddy"), G_CALLBACK(pidgin_dialogs_remove_buddy_cb),
_("Cancel"), NULL);
g_free(text);
}
static void
-pidgindialogs_remove_chat_cb(PurpleChat *chat)
+pidgin_dialogs_remove_chat_cb(PurpleChat *chat)
{
purple_blist_remove_chat(chat);
}
void
-pidgindialogs_remove_chat(PurpleChat *chat)
+pidgin_dialogs_remove_chat(PurpleChat *chat)
{
const gchar *name;
gchar *text;
@@ -1202,7 +1202,7 @@ pidgindialogs_remove_chat(PurpleChat *chat)
name ? name : "");
purple_request_action(chat, NULL, _("Remove Chat"), text, 0, chat, 2,
- _("_Remove Chat"), G_CALLBACK(pidgindialogs_remove_chat_cb),
+ _("_Remove Chat"), G_CALLBACK(pidgin_dialogs_remove_chat_cb),
_("Cancel"), NULL);
g_free(text);
diff --git a/pidgin/gtkdialogs.h b/pidgin/gtkdialogs.h
index 48015f41cc..e7eff1cfce 100644
--- a/pidgin/gtkdialogs.h
+++ b/pidgin/gtkdialogs.h
@@ -30,21 +30,21 @@
#include "conversation.h"
/* Functions in gtkdialogs.c (these should actually stay in this file) */
-void pidgindialogs_destroy_all(void);
-void pidgindialogs_about(void);
-void pidgindialogs_im(void);
-void pidgindialogs_im_with_user(PurpleAccount *, const char *);
-void pidgindialogs_info(void);
-void pidgindialogs_log(void);
-void pidgindialogs_alias_contact(PurpleContact *);
-void pidgindialogs_alias_buddy(PurpleBuddy *);
-void pidgindialogs_alias_chat(PurpleChat *);
+void pidgin_dialogs_destroy_all(void);
+void pidgin_dialogs_about(void);
+void pidgin_dialogs_im(void);
+void pidgin_dialogs_im_with_user(PurpleAccount *, const char *);
+void pidgin_dialogs_info(void);
+void pidgin_dialogs_log(void);
+void pidgin_dialogs_alias_contact(PurpleContact *);
+void pidgin_dialogs_alias_buddy(PurpleBuddy *);
+void pidgin_dialogs_alias_chat(PurpleChat *);
-void pidgindialogs_remove_buddy(PurpleBuddy *);
-void pidgindialogs_remove_group(PurpleGroup *);
-void pidgindialogs_remove_chat(PurpleChat *);
-void pidgindialogs_remove_contact(PurpleContact *);
-void pidgindialogs_merge_groups(PurpleGroup *, const char *);
+void pidgin_dialogs_remove_buddy(PurpleBuddy *);
+void pidgin_dialogs_remove_group(PurpleGroup *);
+void pidgin_dialogs_remove_chat(PurpleChat *);
+void pidgin_dialogs_remove_contact(PurpleContact *);
+void pidgin_dialogs_merge_groups(PurpleGroup *, const char *);
/* Everything after this should probably be moved elsewhere */
diff --git a/pidgin/gtkdocklet.c b/pidgin/gtkdocklet.c
index cdf1ebb5ad..455993b212 100644
--- a/pidgin/gtkdocklet.c
+++ b/pidgin/gtkdocklet.c
@@ -522,7 +522,7 @@ docklet_menu() {
pidgin_separator(menu);
- menuitem = pidgin_new_item_from_stock(menu, _("New Message..."), PIDGIN_STOCK_TOOLBAR_MESSAGE_NEW, G_CALLBACK(pidgindialogs_im), NULL, 0, 0, NULL);
+ menuitem = pidgin_new_item_from_stock(menu, _("New Message..."), PIDGIN_STOCK_TOOLBAR_MESSAGE_NEW, G_CALLBACK(pidgin_dialogs_im), NULL, 0, 0, NULL);
if (status == DOCKLET_STATUS_OFFLINE)
gtk_widget_set_sensitive(menuitem, FALSE);
diff --git a/pidgin/gtkft.c b/pidgin/gtkft.c
index 404e746efe..f41151bca1 100644
--- a/pidgin/gtkft.c
+++ b/pidgin/gtkft.c
@@ -409,7 +409,7 @@ delete_win_cb(GtkWidget *w, GdkEventAny *e, gpointer d)
dialog = (PidginXferDialog *)d;
- pidginxfer_dialog_hide(dialog);
+ pidgin_xfer_dialog_hide(dialog);
return TRUE;
}
@@ -568,7 +568,7 @@ resume_button_cb(GtkButton *button, PidginXferDialog *dialog)
static void
remove_button_cb(GtkButton *button, PidginXferDialog *dialog)
{
- pidginxfer_dialog_remove_xfer(dialog, dialog->selected_xfer);
+ pidgin_xfer_dialog_remove_xfer(dialog, dialog->selected_xfer);
}
static void
@@ -580,7 +580,7 @@ stop_button_cb(GtkButton *button, PidginXferDialog *dialog)
static void
close_button_cb(GtkButton *button, PidginXferDialog *dialog)
{
- pidginxfer_dialog_hide(dialog);
+ pidgin_xfer_dialog_hide(dialog);
}
@@ -739,7 +739,7 @@ make_info_table(PidginXferDialog *dialog)
}
PidginXferDialog *
-pidginxfer_dialog_new(void)
+pidgin_xfer_dialog_new(void)
{
PidginXferDialog *dialog;
GtkWidget *window;
@@ -888,7 +888,7 @@ pidginxfer_dialog_new(void)
}
void
-pidginxfer_dialog_destroy(PidginXferDialog *dialog)
+pidgin_xfer_dialog_destroy(PidginXferDialog *dialog)
{
g_return_if_fail(dialog != NULL);
@@ -900,7 +900,7 @@ pidginxfer_dialog_destroy(PidginXferDialog *dialog)
}
void
-pidginxfer_dialog_show(PidginXferDialog *dialog)
+pidgin_xfer_dialog_show(PidginXferDialog *dialog)
{
PidginXferDialog *tmp;
@@ -908,7 +908,7 @@ pidginxfer_dialog_show(PidginXferDialog *dialog)
tmp = pidgin_get_xfer_dialog();
if (tmp == NULL) {
- tmp = pidginxfer_dialog_new();
+ tmp = pidgin_xfer_dialog_new();
pidgin_set_xfer_dialog(tmp);
}
@@ -919,7 +919,7 @@ pidginxfer_dialog_show(PidginXferDialog *dialog)
}
void
-pidginxfer_dialog_hide(PidginXferDialog *dialog)
+pidgin_xfer_dialog_hide(PidginXferDialog *dialog)
{
g_return_if_fail(dialog != NULL);
@@ -929,7 +929,7 @@ pidginxfer_dialog_hide(PidginXferDialog *dialog)
}
void
-pidginxfer_dialog_add_xfer(PidginXferDialog *dialog, PurpleXfer *xfer)
+pidgin_xfer_dialog_add_xfer(PidginXferDialog *dialog, PurpleXfer *xfer)
{
PidginXferUiData *data;
PurpleXferType type;
@@ -945,7 +945,7 @@ pidginxfer_dialog_add_xfer(PidginXferDialog *dialog, PurpleXfer *xfer)
data = PIDGINXFER(xfer);
data->in_list = TRUE;
- pidginxfer_dialog_show(dialog);
+ pidgin_xfer_dialog_show(dialog);
data->last_updated_time = 0;
@@ -991,7 +991,7 @@ pidginxfer_dialog_add_xfer(PidginXferDialog *dialog, PurpleXfer *xfer)
}
void
-pidginxfer_dialog_remove_xfer(PidginXferDialog *dialog,
+pidgin_xfer_dialog_remove_xfer(PidginXferDialog *dialog,
PurpleXfer *xfer)
{
PidginXferUiData *data;
@@ -1020,7 +1020,7 @@ pidginxfer_dialog_remove_xfer(PidginXferDialog *dialog,
}
void
-pidginxfer_dialog_cancel_xfer(PidginXferDialog *dialog,
+pidgin_xfer_dialog_cancel_xfer(PidginXferDialog *dialog,
PurpleXfer *xfer)
{
PidginXferUiData *data;
@@ -1039,7 +1039,7 @@ pidginxfer_dialog_cancel_xfer(PidginXferDialog *dialog,
return;
if ((purple_xfer_get_status(xfer) == PURPLE_XFER_STATUS_CANCEL_LOCAL) && (dialog->auto_clear)) {
- pidginxfer_dialog_remove_xfer(dialog, xfer);
+ pidgin_xfer_dialog_remove_xfer(dialog, xfer);
return;
}
@@ -1068,7 +1068,7 @@ pidginxfer_dialog_cancel_xfer(PidginXferDialog *dialog,
}
void
-pidginxfer_dialog_update_xfer(PidginXferDialog *dialog,
+pidgin_xfer_dialog_update_xfer(PidginXferDialog *dialog,
PurpleXfer *xfer)
{
PidginXferUiData *data;
@@ -1128,7 +1128,7 @@ pidginxfer_dialog_update_xfer(PidginXferDialog *dialog,
update_detailed_info(xfer_dialog, xfer);
if (purple_xfer_is_completed(xfer) && dialog->auto_clear)
- pidginxfer_dialog_remove_xfer(dialog, xfer);
+ pidgin_xfer_dialog_remove_xfer(dialog, xfer);
else
update_buttons(dialog, xfer);
@@ -1157,14 +1157,14 @@ pidginxfer_dialog_update_xfer(PidginXferDialog *dialog,
}
/* If we got to this point then we know everything is finished */
- pidginxfer_dialog_hide(dialog);
+ pidgin_xfer_dialog_hide(dialog);
}
/**************************************************************************
* File Transfer UI Ops
**************************************************************************/
static void
-pidginxfer_new_xfer(PurpleXfer *xfer)
+pidgin_xfer_new_xfer(PurpleXfer *xfer)
{
PidginXferUiData *data;
@@ -1174,7 +1174,7 @@ pidginxfer_new_xfer(PurpleXfer *xfer)
}
static void
-pidginxfer_destroy(PurpleXfer *xfer)
+pidgin_xfer_destroy(PurpleXfer *xfer)
{
PidginXferUiData *data;
@@ -1187,42 +1187,42 @@ pidginxfer_destroy(PurpleXfer *xfer)
}
static void
-pidginxfer_add_xfer(PurpleXfer *xfer)
+pidgin_xfer_add_xfer(PurpleXfer *xfer)
{
if (xfer_dialog == NULL)
- xfer_dialog = pidginxfer_dialog_new();
+ xfer_dialog = pidgin_xfer_dialog_new();
- pidginxfer_dialog_add_xfer(xfer_dialog, xfer);
+ pidgin_xfer_dialog_add_xfer(xfer_dialog, xfer);
}
static void
-pidginxfer_update_progress(PurpleXfer *xfer, double percent)
+pidgin_xfer_update_progress(PurpleXfer *xfer, double percent)
{
- pidginxfer_dialog_update_xfer(xfer_dialog, xfer);
+ pidgin_xfer_dialog_update_xfer(xfer_dialog, xfer);
}
static void
-pidginxfer_cancel_local(PurpleXfer *xfer)
+pidgin_xfer_cancel_local(PurpleXfer *xfer)
{
if (xfer_dialog)
- pidginxfer_dialog_cancel_xfer(xfer_dialog, xfer);
+ pidgin_xfer_dialog_cancel_xfer(xfer_dialog, xfer);
}
static void
-pidginxfer_cancel_remote(PurpleXfer *xfer)
+pidgin_xfer_cancel_remote(PurpleXfer *xfer)
{
if (xfer_dialog)
- pidginxfer_dialog_cancel_xfer(xfer_dialog, xfer);
+ pidgin_xfer_dialog_cancel_xfer(xfer_dialog, xfer);
}
static PurpleXferUiOps ops =
{
- pidginxfer_new_xfer,
- pidginxfer_destroy,
- pidginxfer_add_xfer,
- pidginxfer_update_progress,
- pidginxfer_cancel_local,
- pidginxfer_cancel_remote
+ pidgin_xfer_new_xfer,
+ pidgin_xfer_destroy,
+ pidgin_xfer_add_xfer,
+ pidgin_xfer_update_progress,
+ pidgin_xfer_cancel_local,
+ pidgin_xfer_cancel_remote
};
/**************************************************************************
@@ -1240,7 +1240,7 @@ void
pidgin_xfers_uninit(void)
{
if (xfer_dialog != NULL)
- pidginxfer_dialog_destroy(xfer_dialog);
+ pidgin_xfer_dialog_destroy(xfer_dialog);
}
void
diff --git a/pidgin/gtkft.h b/pidgin/gtkft.h
index 01861aac5c..7060bc7982 100644
--- a/pidgin/gtkft.h
+++ b/pidgin/gtkft.h
@@ -45,14 +45,14 @@ typedef struct _PidginXferDialog PidginXferDialog;
*
* @return The new dialog.
*/
-PidginXferDialog *pidginxfer_dialog_new(void);
+PidginXferDialog *pidgin_xfer_dialog_new(void);
/**
* Destroys a file transfer dialog.
*
* @param dialog The file transfer dialog.
*/
-void pidginxfer_dialog_destroy(PidginXferDialog *dialog);
+void pidgin_xfer_dialog_destroy(PidginXferDialog *dialog);
/**
* Displays the file transfer dialog given.
@@ -60,14 +60,14 @@ void pidginxfer_dialog_destroy(PidginXferDialog *dialog);
*
* @param dialog The file transfer dialog to show.
*/
-void pidginxfer_dialog_show(PidginXferDialog *dialog);
+void pidgin_xfer_dialog_show(PidginXferDialog *dialog);
/**
* Hides the file transfer dialog.
*
* @param dialog The file transfer dialog to hide.
*/
-void pidginxfer_dialog_hide(PidginXferDialog *dialog);
+void pidgin_xfer_dialog_hide(PidginXferDialog *dialog);
/**
* Adds a file transfer to the dialog.
@@ -75,7 +75,7 @@ void pidginxfer_dialog_hide(PidginXferDialog *dialog);
* @param dialog The file transfer dialog.
* @param xfer The file transfer.
*/
-void pidginxfer_dialog_add_xfer(PidginXferDialog *dialog, PurpleXfer *xfer);
+void pidgin_xfer_dialog_add_xfer(PidginXferDialog *dialog, PurpleXfer *xfer);
/**
* Removes a file transfer from the dialog.
@@ -83,7 +83,7 @@ void pidginxfer_dialog_add_xfer(PidginXferDialog *dialog, PurpleXfer *xfer);
* @param dialog The file transfer dialog.
* @param xfer The file transfer.
*/
-void pidginxfer_dialog_remove_xfer(PidginXferDialog *dialog,
+void pidgin_xfer_dialog_remove_xfer(PidginXferDialog *dialog,
PurpleXfer *xfer);
/**
@@ -92,7 +92,7 @@ void pidginxfer_dialog_remove_xfer(PidginXferDialog *dialog,
* @param dialog The file transfer dialog.
* @param xfer The file transfer that was canceled.
*/
-void pidginxfer_dialog_cancel_xfer(PidginXferDialog *dialog,
+void pidgin_xfer_dialog_cancel_xfer(PidginXferDialog *dialog,
PurpleXfer *xfer);
/**
@@ -101,7 +101,7 @@ void pidginxfer_dialog_cancel_xfer(PidginXferDialog *dialog,
* @param dialog The file transfer dialog.
* @param xfer The file transfer.
*/
-void pidginxfer_dialog_update_xfer(PidginXferDialog *dialog,
+void pidgin_xfer_dialog_update_xfer(PidginXferDialog *dialog,
PurpleXfer *xfer);
/*@}*/
diff --git a/pidgin/gtkimhtmltoolbar.c b/pidgin/gtkimhtmltoolbar.c
index 2c4af0f1bd..8c55c88d9e 100644
--- a/pidgin/gtkimhtmltoolbar.c
+++ b/pidgin/gtkimhtmltoolbar.c
@@ -653,9 +653,9 @@ insert_smiley_cb(GtkWidget *smiley, GtkIMHtmlToolbar *toolbar)
}
if (toolbar->sml)
- smileys = pidginthemes_get_proto_smileys(toolbar->sml);
+ smileys = pidgin_themes_get_proto_smileys(toolbar->sml);
else
- smileys = pidginthemes_get_proto_smileys(NULL);
+ smileys = pidgin_themes_get_proto_smileys(NULL);
while(smileys) {
GtkIMHtmlSmiley *smiley = smileys->data;
diff --git a/pidgin/gtkmain.c b/pidgin/gtkmain.c
index 66b7b5e01f..f10906232a 100644
--- a/pidgin/gtkmain.c
+++ b/pidgin/gtkmain.c
@@ -249,7 +249,7 @@ ui_main()
#endif
- pidginthemes_init();
+ pidgin_themes_init();
pidgin_blist_setup_sort_methods();
diff --git a/pidgin/gtkprefs.c b/pidgin/gtkprefs.c
index f9d7c6ebe3..dbaca23fd6 100644
--- a/pidgin/gtkprefs.c
+++ b/pidgin/gtkprefs.c
@@ -415,7 +415,7 @@ static GtkTreeRowReference *theme_refresh_theme_list()
gtk_tree_row_reference_free(previous_smiley_row);
previous_smiley_row = NULL;
- pidginthemes_smiley_theme_probe();
+ pidgin_themes_smiley_theme_probe();
if (!(themes = smiley_themes))
return NULL;
@@ -2018,7 +2018,7 @@ smiley_theme_pref_cb(const char *name, PurplePrefType type,
for (themes = smiley_themes; themes; themes = themes->next) {
struct smiley_theme *smile = themes->data;
if (smile->name && strcmp(themename, smile->name) == 0) {
- pidginthemes_load_smiley_theme(smile->path, TRUE);
+ pidgin_themes_load_smiley_theme(smile->path, TRUE);
break;
}
}
diff --git a/pidgin/gtkthemes.c b/pidgin/gtkthemes.c
index 5c3f076448..8c4a9e7944 100644
--- a/pidgin/gtkthemes.c
+++ b/pidgin/gtkthemes.c
@@ -36,7 +36,7 @@
GSList *smiley_themes = NULL;
struct smiley_theme *current_smiley_theme;
-gboolean pidginthemes_smileys_disabled()
+gboolean pidgin_themes_smileys_disabled()
{
if (!current_smiley_theme)
return 1;
@@ -44,7 +44,7 @@ gboolean pidginthemes_smileys_disabled()
return strcmp(current_smiley_theme->name, "none") == 0;
}
-void pidginthemes_smiley_themeize(GtkWidget *imhtml)
+void pidgin_themes_smiley_themeize(GtkWidget *imhtml)
{
struct smiley_list *list;
if (!current_smiley_theme)
@@ -64,7 +64,7 @@ void pidginthemes_smiley_themeize(GtkWidget *imhtml)
}
static void
-pidginthemes_destroy_smiley_theme(struct smiley_theme *theme)
+pidgin_themes_destroy_smiley_theme(struct smiley_theme *theme)
{
GHashTable *already_freed;
struct smiley_list *wer;
@@ -92,7 +92,7 @@ pidginthemes_destroy_smiley_theme(struct smiley_theme *theme)
g_hash_table_destroy(already_freed);
}
-void pidginthemes_load_smiley_theme(const char *file, gboolean load)
+void pidgin_themes_load_smiley_theme(const char *file, gboolean load)
{
FILE *f = g_fopen(file, "r");
char buf[256];
@@ -211,7 +211,7 @@ void pidginthemes_load_smiley_theme(const char *file, gboolean load)
if (!theme->name || !theme->desc || !theme->author) {
purple_debug_error("gtkthemes", "Invalid file format, not loading smiley theme from '%s'\n", file);
- pidginthemes_destroy_smiley_theme(theme);
+ pidgin_themes_destroy_smiley_theme(theme);
g_free(theme->name);
g_free(theme->desc);
@@ -231,21 +231,21 @@ void pidginthemes_load_smiley_theme(const char *file, gboolean load)
GList *cnv;
if (current_smiley_theme)
- pidginthemes_destroy_smiley_theme(current_smiley_theme);
+ pidgin_themes_destroy_smiley_theme(current_smiley_theme);
current_smiley_theme = theme;
for (cnv = purple_get_conversations(); cnv != NULL; cnv = cnv->next) {
PurpleConversation *conv = cnv->data;
if (PIDGIN_IS_PIDGIN_CONVERSATION(conv)) {
- pidginthemes_smiley_themeize(PIDGIN_CONVERSATION(conv)->imhtml);
- pidginthemes_smiley_themeize(PIDGIN_CONVERSATION(conv)->entry);
+ pidgin_themes_smiley_themeize(PIDGIN_CONVERSATION(conv)->imhtml);
+ pidgin_themes_smiley_themeize(PIDGIN_CONVERSATION(conv)->entry);
}
}
}
}
-void pidginthemes_smiley_theme_probe()
+void pidgin_themes_smiley_theme_probe()
{
GDir *dir;
const gchar *file;
@@ -266,7 +266,7 @@ void pidginthemes_smiley_theme_probe()
* We set the second argument to FALSE so that it doesn't load
* the theme yet.
*/
- pidginthemes_load_smiley_theme(path, FALSE);
+ pidgin_themes_load_smiley_theme(path, FALSE);
g_free(path);
}
g_dir_close(dir);
@@ -277,7 +277,7 @@ void pidginthemes_smiley_theme_probe()
}
}
-GSList *pidginthemes_get_proto_smileys(const char *id) {
+GSList *pidgin_themes_get_proto_smileys(const char *id) {
PurplePlugin *proto;
struct smiley_list *list, *def;
@@ -303,18 +303,18 @@ GSList *pidginthemes_get_proto_smileys(const char *id) {
return list ? list->smileys : def->smileys;
}
-void pidginthemes_init()
+void pidgin_themes_init()
{
GSList *l;
const char *current_theme =
purple_prefs_get_string(PIDGIN_PREFS_ROOT "/smileys/theme");
- pidginthemes_smiley_theme_probe();
+ pidgin_themes_smiley_theme_probe();
for (l = smiley_themes; l; l = l->next) {
struct smiley_theme *smile = l->data;
if (smile->name && strcmp(current_theme, smile->name) == 0) {
- pidginthemes_load_smiley_theme(smile->path, TRUE);
+ pidgin_themes_load_smiley_theme(smile->path, TRUE);
break;
}
}
@@ -322,7 +322,7 @@ void pidginthemes_init()
/* If we still don't have a smiley theme, choose the first one */
if (!current_smiley_theme && smiley_themes) {
struct smiley_theme *smile = smiley_themes->data;
- pidginthemes_load_smiley_theme(smile->path, TRUE);
+ pidgin_themes_load_smiley_theme(smile->path, TRUE);
}
}
diff --git a/pidgin/gtkthemes.h b/pidgin/gtkthemes.h
index 071662e08b..86f904af60 100644
--- a/pidgin/gtkthemes.h
+++ b/pidgin/gtkthemes.h
@@ -44,10 +44,10 @@ struct smiley_theme {
extern struct smiley_theme *current_smiley_theme;
extern GSList *smiley_themes;
-void pidginthemes_init(void);
-gboolean pidginthemes_smileys_disabled(void);
-void pidginthemes_smiley_themeize(GtkWidget *);
-void pidginthemes_smiley_theme_probe(void);
-void pidginthemes_load_smiley_theme(const char *file, gboolean load);
-GSList *pidginthemes_get_proto_smileys(const char *id);
+void pidgin_themes_init(void);
+gboolean pidgin_themes_smileys_disabled(void);
+void pidgin_themes_smiley_themeize(GtkWidget *);
+void pidgin_themes_smiley_theme_probe(void);
+void pidgin_themes_load_smiley_theme(const char *file, gboolean load);
+GSList *pidgin_themes_get_proto_smileys(const char *id);
#endif /* _PIDGINDIALOGS_H_ */
diff --git a/pidgin/gtkutils.c b/pidgin/gtkutils.c
index 9af105a974..20b7b5c49b 100644
--- a/pidgin/gtkutils.c
+++ b/pidgin/gtkutils.c
@@ -95,7 +95,7 @@ pidgin_setup_imhtml(GtkWidget *imhtml)
g_signal_connect(G_OBJECT(imhtml), "url_clicked",
G_CALLBACK(url_clicked_cb), NULL);
- pidginthemes_smiley_themeize(imhtml);
+ pidgin_themes_smiley_themeize(imhtml);
gtk_imhtml_set_funcs(GTK_IMHTML(imhtml), &gtkimhtml_cbs);