- Remove the namespace prefix for static functions
- Add 'individual' suffix
https://bugzilla.gnome.org/show_bug.cgi?id=732100
G_DEFINE_TYPE (EmpathyIndividualMenu, empathy_individual_menu, GTK_TYPE_MENU);
G_DEFINE_TYPE (EmpathyIndividualMenu, empathy_individual_menu, GTK_TYPE_MENU);
-static GtkWidget * empathy_individual_chat_menu_item_new (
- EmpathyIndividualMenu *self, FolksIndividual *individual);
-static GtkWidget * empathy_individual_sms_menu_item_new (
- EmpathyIndividualMenu *self, FolksIndividual *individual);
-static GtkWidget * empathy_individual_log_menu_item_new (
+static GtkWidget * chat_menu_item_new_individual (EmpathyIndividualMenu *self,
FolksIndividual *individual);
FolksIndividual *individual);
-static GtkWidget * empathy_individual_info_menu_item_new (
+static GtkWidget * sms_menu_item_new_individual (EmpathyIndividualMenu *self,
FolksIndividual *individual);
FolksIndividual *individual);
-static GtkWidget * empathy_individual_edit_menu_item_new (
- FolksIndividual *individual);
-static GtkWidget * empathy_individual_invite_menu_item_new (
- FolksIndividual *individual,
+static GtkWidget * log_menu_item_new_individual (FolksIndividual *individual);
+static GtkWidget * info_menu_item_new_individual (FolksIndividual *individual);
+static GtkWidget * edit_menu_item_new_individual (FolksIndividual *individual);
+static GtkWidget * invite_menu_item_new (FolksIndividual *individual,
EmpathyContact *contact);
EmpathyContact *contact);
-static GtkWidget * empathy_individual_file_transfer_menu_item_new (
- EmpathyIndividualMenu *self, FolksIndividual *individual);
-static GtkWidget * empathy_individual_share_my_desktop_menu_item_new (
- EmpathyIndividualMenu *self, FolksIndividual *individual);
-static GtkWidget * empathy_individual_favourite_menu_item_new (
+static GtkWidget * file_transfer_menu_item_new_individual (EmpathyIndividualMenu *self,
FolksIndividual *individual);
FolksIndividual *individual);
-static GtkWidget * empathy_individual_add_menu_item_new (
- EmpathyIndividualMenu *self,
+static GtkWidget * share_my_desktop_menu_item_new_individual (EmpathyIndividualMenu *self,
FolksIndividual *individual);
FolksIndividual *individual);
-static GtkWidget * empathy_individiual_block_menu_item_new (
+static GtkWidget * favourite_menu_item_new_individual (FolksIndividual *individual);
+static GtkWidget * add_menu_item_new_individual (EmpathyIndividualMenu *self,
FolksIndividual *individual);
FolksIndividual *individual);
-static GtkWidget * empathy_individiual_remove_menu_item_new (
- EmpathyIndividualMenu *self);
+static GtkWidget * block_menu_item_new_individual (FolksIndividual *individual);
+static GtkWidget * remove_menu_item_new_individual (EmpathyIndividualMenu *self);
static void
individual_menu_add_personas (EmpathyIndividualMenu *self,
static void
individual_menu_add_personas (EmpathyIndividualMenu *self,
/* Chat */
if (features & EMPATHY_INDIVIDUAL_FEATURE_CHAT)
{
/* Chat */
if (features & EMPATHY_INDIVIDUAL_FEATURE_CHAT)
{
- action = empathy_individual_chat_menu_item_new (self,
- single_individual);
+ action = chat_menu_item_new_individual (self, single_individual);
gtk_menu_shell_append (GTK_MENU_SHELL (contact_submenu), action);
gtk_widget_show (action);
}
gtk_menu_shell_append (GTK_MENU_SHELL (contact_submenu), action);
gtk_widget_show (action);
}
/* SMS */
if (features & EMPATHY_INDIVIDUAL_FEATURE_SMS)
{
/* SMS */
if (features & EMPATHY_INDIVIDUAL_FEATURE_SMS)
{
- action = empathy_individual_sms_menu_item_new (self,
- single_individual);
+ action = sms_menu_item_new_individual (self, single_individual);
gtk_menu_shell_append (GTK_MENU_SHELL (contact_submenu), action);
gtk_widget_show (action);
}
gtk_menu_shell_append (GTK_MENU_SHELL (contact_submenu), action);
gtk_widget_show (action);
}
if (features & EMPATHY_INDIVIDUAL_FEATURE_CALL)
{
/* Audio Call */
if (features & EMPATHY_INDIVIDUAL_FEATURE_CALL)
{
/* Audio Call */
- action = empathy_individual_audio_call_menu_item_new (
+ action = empathy_individual_audio_call_menu_item_new_individual (
self, single_individual);
gtk_menu_shell_append (GTK_MENU_SHELL (contact_submenu), action);
gtk_widget_show (action);
/* Video Call */
self, single_individual);
gtk_menu_shell_append (GTK_MENU_SHELL (contact_submenu), action);
gtk_widget_show (action);
/* Video Call */
- action = empathy_individual_video_call_menu_item_new (
+ action = empathy_individual_video_call_menu_item_new_individual (
self, single_individual);
gtk_menu_shell_append (GTK_MENU_SHELL (contact_submenu), action);
gtk_widget_show (action);
self, single_individual);
gtk_menu_shell_append (GTK_MENU_SHELL (contact_submenu), action);
gtk_widget_show (action);
/* Log */
if (features & EMPATHY_INDIVIDUAL_FEATURE_LOG)
{
/* Log */
if (features & EMPATHY_INDIVIDUAL_FEATURE_LOG)
{
- action = empathy_individual_log_menu_item_new (single_individual);
+ action = log_menu_item_new_individual (single_individual);
gtk_menu_shell_append (GTK_MENU_SHELL (contact_submenu), action);
gtk_widget_show (action);
}
/* Invite */
gtk_menu_shell_append (GTK_MENU_SHELL (contact_submenu), action);
gtk_widget_show (action);
}
/* Invite */
- action = empathy_individual_invite_menu_item_new (NULL, contact);
+ action = invite_menu_item_new (NULL, contact);
gtk_menu_shell_append (GTK_MENU_SHELL (contact_submenu), action);
gtk_widget_show (action);
/* File transfer */
if (features & EMPATHY_INDIVIDUAL_FEATURE_FILE_TRANSFER)
{
gtk_menu_shell_append (GTK_MENU_SHELL (contact_submenu), action);
gtk_widget_show (action);
/* File transfer */
if (features & EMPATHY_INDIVIDUAL_FEATURE_FILE_TRANSFER)
{
- action = empathy_individual_file_transfer_menu_item_new (
- self, single_individual);
+ action = file_transfer_menu_item_new_individual (self, single_individual);
gtk_menu_shell_append (GTK_MENU_SHELL (contact_submenu), action);
gtk_widget_show (action);
}
/* Share my desktop */
gtk_menu_shell_append (GTK_MENU_SHELL (contact_submenu), action);
gtk_widget_show (action);
}
/* Share my desktop */
- action = empathy_individual_share_my_desktop_menu_item_new (
- self, single_individual);
+ action = share_my_desktop_menu_item_new_individual (self, single_individual);
gtk_menu_shell_append (GTK_MENU_SHELL (contact_submenu), action);
gtk_widget_show (action);
/* Block */
if (features & EMPATHY_INDIVIDUAL_FEATURE_BLOCK &&
gtk_menu_shell_append (GTK_MENU_SHELL (contact_submenu), action);
gtk_widget_show (action);
/* Block */
if (features & EMPATHY_INDIVIDUAL_FEATURE_BLOCK &&
- (item = empathy_individiual_block_menu_item_new (single_individual))
+ (item = block_menu_item_new_individual (single_individual))
!= NULL) {
GtkWidget *sep;
!= NULL) {
GtkWidget *sep;
-empathy_individiual_block_menu_item_new (FolksIndividual *individual)
+block_menu_item_new_individual (FolksIndividual *individual)
{
GtkWidget *item;
GList *contacts, *l;
{
GtkWidget *item;
GList *contacts, *l;
-empathy_individiual_remove_menu_item_new (EmpathyIndividualMenu *self)
+remove_menu_item_new_individual (EmpathyIndividualMenu *self)
{
GeeSet *personas;
GeeIterator *iter;
{
GeeSet *personas;
GeeIterator *iter;
/* Add contact */
if (features & EMPATHY_INDIVIDUAL_FEATURE_ADD_CONTACT)
{
/* Add contact */
if (features & EMPATHY_INDIVIDUAL_FEATURE_ADD_CONTACT)
{
- item = empathy_individual_add_menu_item_new (self, individual);
+ item = add_menu_item_new_individual (self, individual);
if (item != NULL)
{
gtk_menu_shell_append (GTK_MENU_SHELL (shell), item);
if (item != NULL)
{
gtk_menu_shell_append (GTK_MENU_SHELL (shell), item);
/* Chat */
if (features & EMPATHY_INDIVIDUAL_FEATURE_CHAT)
{
/* Chat */
if (features & EMPATHY_INDIVIDUAL_FEATURE_CHAT)
{
- item = empathy_individual_chat_menu_item_new (self, individual);
+ item = chat_menu_item_new_individual (self, individual);
if (item != NULL)
{
gtk_menu_shell_append (shell, item);
if (item != NULL)
{
gtk_menu_shell_append (shell, item);
/* SMS */
if (features & EMPATHY_INDIVIDUAL_FEATURE_SMS)
{
/* SMS */
if (features & EMPATHY_INDIVIDUAL_FEATURE_SMS)
{
- item = empathy_individual_sms_menu_item_new (self, individual);
+ item = sms_menu_item_new_individual (self, individual);
if (item != NULL)
{
gtk_menu_shell_append (shell, item);
if (item != NULL)
{
gtk_menu_shell_append (shell, item);
if (features & EMPATHY_INDIVIDUAL_FEATURE_CALL)
{
/* Audio Call */
if (features & EMPATHY_INDIVIDUAL_FEATURE_CALL)
{
/* Audio Call */
- item = empathy_individual_audio_call_menu_item_new (self, individual);
+ item = empathy_individual_audio_call_menu_item_new_individual (self,
+ individual);
gtk_menu_shell_append (shell, item);
gtk_widget_show (item);
/* Video Call */
gtk_menu_shell_append (shell, item);
gtk_widget_show (item);
/* Video Call */
- item = empathy_individual_video_call_menu_item_new (self, individual);
+ item = empathy_individual_video_call_menu_item_new_individual (self,
+ individual);
gtk_menu_shell_append (shell, item);
gtk_widget_show (item);
}
gtk_menu_shell_append (shell, item);
gtk_widget_show (item);
}
add_phone_numbers (self);
/* Invite */
add_phone_numbers (self);
/* Invite */
- item = empathy_individual_invite_menu_item_new (individual, NULL);
+ item = invite_menu_item_new (individual, NULL);
gtk_menu_shell_append (shell, item);
gtk_widget_show (item);
/* File transfer */
if (features & EMPATHY_INDIVIDUAL_FEATURE_FILE_TRANSFER)
{
gtk_menu_shell_append (shell, item);
gtk_widget_show (item);
/* File transfer */
if (features & EMPATHY_INDIVIDUAL_FEATURE_FILE_TRANSFER)
{
- item = empathy_individual_file_transfer_menu_item_new (self, individual);
+ item = file_transfer_menu_item_new_individual (self, individual);
gtk_menu_shell_append (shell, item);
gtk_widget_show (item);
}
gtk_menu_shell_append (shell, item);
gtk_widget_show (item);
}
/* Share my desktop */
/* FIXME we should add the "Share my desktop" menu item if Vino is
a registered handler in MC5 */
/* Share my desktop */
/* FIXME we should add the "Share my desktop" menu item if Vino is
a registered handler in MC5 */
- item = empathy_individual_share_my_desktop_menu_item_new (self, individual);
+ item = share_my_desktop_menu_item_new_individual (self, individual);
gtk_menu_shell_append (shell, item);
gtk_widget_show (item);
gtk_menu_shell_append (shell, item);
gtk_widget_show (item);
/* Edit */
if (features & EMPATHY_INDIVIDUAL_FEATURE_EDIT)
{
/* Edit */
if (features & EMPATHY_INDIVIDUAL_FEATURE_EDIT)
{
- item = empathy_individual_edit_menu_item_new (individual);
+ item = edit_menu_item_new_individual (individual);
gtk_menu_shell_append (shell, item);
gtk_widget_show (item);
}
gtk_menu_shell_append (shell, item);
gtk_widget_show (item);
}
/* Log */
if (features & EMPATHY_INDIVIDUAL_FEATURE_LOG)
{
/* Log */
if (features & EMPATHY_INDIVIDUAL_FEATURE_LOG)
{
- item = empathy_individual_log_menu_item_new (individual);
+ item = log_menu_item_new_individual (individual);
gtk_menu_shell_append (shell, item);
gtk_widget_show (item);
}
gtk_menu_shell_append (shell, item);
gtk_widget_show (item);
}
/* Info */
if (features & EMPATHY_INDIVIDUAL_FEATURE_INFO)
{
/* Info */
if (features & EMPATHY_INDIVIDUAL_FEATURE_INFO)
{
- item = empathy_individual_info_menu_item_new (individual);
+ item = info_menu_item_new_individual (individual);
gtk_menu_shell_append (shell, item);
gtk_widget_show (item);
}
gtk_menu_shell_append (shell, item);
gtk_widget_show (item);
}
/* Favorite checkbox */
if (features & EMPATHY_INDIVIDUAL_FEATURE_FAVOURITE)
{
/* Favorite checkbox */
if (features & EMPATHY_INDIVIDUAL_FEATURE_FAVOURITE)
{
- item = empathy_individual_favourite_menu_item_new (individual);
+ item = favourite_menu_item_new_individual (individual);
gtk_menu_shell_append (shell, item);
gtk_widget_show (item);
}
/* Separator & Block */
if (features & EMPATHY_INDIVIDUAL_FEATURE_BLOCK &&
gtk_menu_shell_append (shell, item);
gtk_widget_show (item);
}
/* Separator & Block */
if (features & EMPATHY_INDIVIDUAL_FEATURE_BLOCK &&
- (item = empathy_individiual_block_menu_item_new (individual)) != NULL) {
+ (item = block_menu_item_new_individual (individual)) != NULL) {
GtkWidget *sep;
sep = gtk_separator_menu_item_new ();
GtkWidget *sep;
sep = gtk_separator_menu_item_new ();
/* Separator & Remove */
if (features & EMPATHY_INDIVIDUAL_FEATURE_REMOVE &&
/* Separator & Remove */
if (features & EMPATHY_INDIVIDUAL_FEATURE_REMOVE &&
- (item = empathy_individiual_remove_menu_item_new (self)) != NULL) {
+ (item = remove_menu_item_new_individual (self)) != NULL) {
GtkWidget *sep;
sep = gtk_separator_menu_item_new ();
GtkWidget *sep;
sep = gtk_separator_menu_item_new ();
-empathy_individual_chat_menu_item_new (EmpathyIndividualMenu *self,
+chat_menu_item_new_individual (EmpathyIndividualMenu *self,
FolksIndividual *individual)
{
GtkWidget *item;
FolksIndividual *individual)
{
GtkWidget *item;
-empathy_individual_sms_menu_item_new (EmpathyIndividualMenu *self,
+sms_menu_item_new_individual (EmpathyIndividualMenu *self,
FolksIndividual *individual)
{
GtkWidget *item;
FolksIndividual *individual)
{
GtkWidget *item;
-empathy_individual_audio_call_menu_item_new (EmpathyIndividualMenu *self,
+empathy_individual_audio_call_menu_item_new_individual (
+ EmpathyIndividualMenu *self,
FolksIndividual *individual)
{
GtkWidget *item;
FolksIndividual *individual)
{
GtkWidget *item;
-empathy_individual_video_call_menu_item_new (EmpathyIndividualMenu *self,
+empathy_individual_video_call_menu_item_new_individual (
+ EmpathyIndividualMenu *self,
FolksIndividual *individual)
{
GtkWidget *item;
FolksIndividual *individual)
{
GtkWidget *item;
-empathy_individual_log_menu_item_new (FolksIndividual *individual)
+log_menu_item_new_individual (FolksIndividual *individual)
{
GtkWidget *item;
GtkWidget *image;
{
GtkWidget *item;
GtkWidget *image;
-empathy_individual_file_transfer_menu_item_new (EmpathyIndividualMenu *self,
+file_transfer_menu_item_new_individual (EmpathyIndividualMenu *self,
FolksIndividual *individual)
{
GtkWidget *item;
FolksIndividual *individual)
{
GtkWidget *item;
-empathy_individual_share_my_desktop_menu_item_new (EmpathyIndividualMenu *self,
+share_my_desktop_menu_item_new_individual (EmpathyIndividualMenu *self,
FolksIndividual *individual)
{
GtkWidget *item;
FolksIndividual *individual)
{
GtkWidget *item;
-empathy_individual_favourite_menu_item_new (FolksIndividual *individual)
+favourite_menu_item_new_individual (FolksIndividual *individual)
-empathy_individual_info_menu_item_new (FolksIndividual *individual)
+info_menu_item_new_individual (FolksIndividual *individual)
{
GtkWidget *item;
GtkWidget *image;
{
GtkWidget *item;
GtkWidget *image;
-empathy_individual_edit_menu_item_new (FolksIndividual *individual)
+edit_menu_item_new_individual (FolksIndividual *individual)
{
EmpathyIndividualManager *manager;
GtkWidget *item;
{
EmpathyIndividualManager *manager;
GtkWidget *item;
-empathy_individual_invite_menu_item_new (FolksIndividual *individual,
+invite_menu_item_new (FolksIndividual *individual,
EmpathyContact *contact)
{
GtkWidget *item;
EmpathyContact *contact)
{
GtkWidget *item;
-empathy_individual_add_menu_item_new (EmpathyIndividualMenu *self,
+add_menu_item_new_individual (EmpathyIndividualMenu *self,
FolksIndividual *individual)
{
EmpathyIndividualMenuPriv *priv = GET_PRIV (self);
FolksIndividual *individual)
{
EmpathyIndividualMenuPriv *priv = GET_PRIV (self);
EmpathyIndividualFeatureFlags features,
EmpathyIndividualStore *store);
EmpathyIndividualFeatureFlags features,
EmpathyIndividualStore *store);
-GtkWidget * empathy_individual_audio_call_menu_item_new (
+GtkWidget * empathy_individual_audio_call_menu_item_new_individual (
EmpathyIndividualMenu *self, FolksIndividual *individual);
EmpathyIndividualMenu *self, FolksIndividual *individual);
-GtkWidget * empathy_individual_video_call_menu_item_new (
+GtkWidget * empathy_individual_video_call_menu_item_new_individual (
EmpathyIndividualMenu *self, FolksIndividual *individual);
G_END_DECLS
EmpathyIndividualMenu *self, FolksIndividual *individual);
G_END_DECLS
shell = GTK_MENU_SHELL (menu);
/* audio */
shell = GTK_MENU_SHELL (menu);
/* audio */
- item = empathy_individual_audio_call_menu_item_new (NULL, individual);
+ item = empathy_individual_audio_call_menu_item_new_individual (NULL,
+ individual);
gtk_menu_shell_append (shell, item);
gtk_widget_show (item);
/* video */
gtk_menu_shell_append (shell, item);
gtk_widget_show (item);
/* video */
- item = empathy_individual_video_call_menu_item_new (NULL, individual);
+ item = empathy_individual_video_call_menu_item_new_individual (NULL,
+ individual);
gtk_menu_shell_append (shell, item);
gtk_widget_show (item);
gtk_menu_shell_append (shell, item);
gtk_widget_show (item);