/soc/2015/igor.gajowiak/chatlog: e11825198885: Removed unused me...

[Igor Gajowiak]

Changeset: e118251988855e87279281594d45e07bae45b65c
Author:	 Igor Gajowiak <igor.gajowiak at gmail.com>
Date:	 2015-08-16 15:02 +0200
Branch:	 default
URL: https://hg.pidgin.im/soc/2015/igor.gajowiak/chatlog/rev/e11825198885

Description:

Removed unused menu items from the gtk generic log. Fixed some line breaks.

diffstat:

 pidgin/gtkgenericlog.c |  80 +------------------------------------------------
 1 files changed, 2 insertions(+), 78 deletions(-)

diffs (153 lines):

diff --git a/pidgin/gtkgenericlog.c b/pidgin/gtkgenericlog.c
--- a/pidgin/gtkgenericlog.c
+++ b/pidgin/gtkgenericlog.c
@@ -331,12 +331,6 @@ on_search_item_clicked(GtkAction *action
 }
 
 static void
-on_export_item_clicked(GtkAction *action, gpointer data)
-{
-	printf("on_export_item_clicked\n");
-}
-
-static void
 on_import_item_clicked(GtkAction *action, gpointer data)
 {
 	g_assert(data);
@@ -358,12 +352,6 @@ on_close_item_clicked(GtkAction *action,
 	gtk_widget_hide(viewer->window);
 }
 
-static void
-on_print_item_clicked(GtkAction *action, gpointer data)
-{
-	printf("on_print_item_clicked\n");
-}
-
 static GtkWidget *
 create_archive_menu_item(PidginGenericLogViewer *viewer,
 	GtkWidget **search_item_res)
@@ -377,28 +365,20 @@ create_archive_menu_item(PidginGenericLo
 
 	GtkWidget *reload_item = gtk_menu_item_new_with_label("Reload");
 	GtkWidget *search_item = gtk_menu_item_new_with_label("Search");
-	GtkWidget *export_item = gtk_menu_item_new_with_label("Export");
 	GtkWidget *import_item = gtk_menu_item_new_with_label("Import");
-	GtkWidget *print_item = gtk_menu_item_new_with_label("Print");
 	GtkWidget *close_item = gtk_menu_item_new_with_label("Close");
 
 	gtk_menu_shell_append(GTK_MENU_SHELL(archive_menu), reload_item);
 	gtk_menu_shell_append(GTK_MENU_SHELL(archive_menu), search_item);
-	gtk_menu_shell_append(GTK_MENU_SHELL(archive_menu), export_item);
 	gtk_menu_shell_append(GTK_MENU_SHELL(archive_menu), import_item);
-	gtk_menu_shell_append(GTK_MENU_SHELL(archive_menu), print_item);
 	gtk_menu_shell_append(GTK_MENU_SHELL(archive_menu), close_item);
 
 	g_signal_connect(G_OBJECT(reload_item), "activate",
 		G_CALLBACK(on_reload_item_clicked), viewer);
 	g_signal_connect(G_OBJECT(search_item), "activate",
 		G_CALLBACK(on_search_item_clicked), viewer);
-	g_signal_connect(G_OBJECT(export_item), "activate",
-		G_CALLBACK(on_export_item_clicked), viewer);
 	g_signal_connect(G_OBJECT(import_item), "activate",
 		G_CALLBACK(on_import_item_clicked), viewer);
-	g_signal_connect(G_OBJECT(print_item), "activate",
-		G_CALLBACK(on_print_item_clicked), viewer);
 	g_signal_connect(G_OBJECT(close_item), "activate",
 		G_CALLBACK(on_close_item_clicked), viewer);
 
@@ -407,46 +387,6 @@ create_archive_menu_item(PidginGenericLo
 	return archive_item;
 }
 
-static void
-on_display_status_changes_item_clicked(GtkAction *action, gpointer data)
-{
-	printf("on_display_status_changes_item_clicked\n");
-}
-
-static void
-on_display_inline_msgs_item_clicked(GtkAction *action, gpointer data)
-{
-	printf("on_display_inline_msgs_item_clicked\n");
-}
-
-static GtkWidget *
-create_options_menu_item(PidginGenericLogViewer *viewer)
-{
-	g_assert(viewer);
-
-	GtkWidget *options_item = gtk_menu_item_new_with_label("Options");
-
-	GtkWidget *options_menu = gtk_menu_new();
-	gtk_menu_item_set_submenu(GTK_MENU_ITEM(options_item), options_menu);
-
-	GtkWidget *display_status_changes_item = gtk_menu_item_new_with_label(
-		"Display status changes");
-	GtkWidget *display_inline_msgs_item = gtk_menu_item_new_with_label(
-		"Display inline messages");
-
-	gtk_menu_shell_append(GTK_MENU_SHELL(options_menu),
-		display_status_changes_item);
-	gtk_menu_shell_append(GTK_MENU_SHELL(options_menu),
-		display_inline_msgs_item);
-
-	g_signal_connect(G_OBJECT(display_status_changes_item), "activate",
-		G_CALLBACK(on_display_status_changes_item_clicked), viewer);
-	g_signal_connect(G_OBJECT(display_inline_msgs_item), "activate",
-		G_CALLBACK(on_display_inline_msgs_item_clicked), viewer);
-
-	return options_item;
-}
-
 static PurpleAccount *
 get_account_from_contact(PurpleBlistNode *contact)
 {
@@ -576,9 +516,6 @@ create_menu_bar(PidginGenericLogViewer *
 		search_item_res);
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu_bar), archive_item);
 
-	GtkWidget *options_item = create_options_menu_item(viewer);
-	gtk_menu_shell_append(GTK_MENU_SHELL(menu_bar), options_item);
-
 	GtkWidget *contact_item = create_contact_menu_item(viewer,
 		start_conversation_item_res, wipe_log_for_contact_item_res);
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu_bar), contact_item);
@@ -665,7 +602,8 @@ on_buddylist_row_changed(GtkTreeSelectio
 	PurpleBlistNode *contact = NULL;
 
 	if (gtk_tree_selection_get_selected(sel, &model, &row)) {
-		gtk_tree_model_get(model, &row, BLIST_TREE_STORE_COL_CONTACT, &contact, -1);
+		gtk_tree_model_get(model, &row, BLIST_TREE_STORE_COL_CONTACT,
+			&contact, -1);
 
 		if (contact)
 			viewer->current_contact = contact;
@@ -1102,17 +1040,6 @@ select_calendar_last_day(PidginGenericLo
 	gtk_tree_selection_select_iter(selection, &day_iter);
 }
 
-static gboolean
-popup_calendar_button_pressed(GtkWidget *treeview, GdkEventButton *event,
-	gpointer data)
-{
-	printf("popup_calendar_button_pressed\n");
-
-	if (event->type == GDK_BUTTON_PRESS && event->button == 3)
-		return TRUE;
-	return FALSE;
-}
-
 static GtkTreeStore *
 create_calendar_store(void)
 {
@@ -1208,9 +1135,6 @@ create_calendar_view(GtkTreeStore *store
 	g_signal_connect(G_OBJECT(selection), "changed",
 		G_CALLBACK(on_calendar_row_changed), viewer);
 
-	g_signal_connect(view, "button-press-event",
-		G_CALLBACK(popup_calendar_button_pressed), viewer);
-
 	return view;
 }