8 files changed, 4 insertions(+), 101 deletions(-)

M src/common/cfgfiles.c
M src/common/hexchat.c
M src/common/hexchat.h
M src/common/hexchatc.h
M src/fe-gtk/editlist.c
M src/fe-gtk/fe-gtk.c
M src/fe-gtk/menu.c
M src/fe-gtk/menu.h

@@ 463,7 463,6 @@ const struct prefs vars[] =
 	{"gui_ulist_sort", P_OFFINT (hex_gui_ulist_sort), TYPE_INT},
 	{"gui_ulist_style", P_OFFINT (hex_gui_ulist_style), TYPE_BOOL},
 	{"gui_url_mod", P_OFFINT (hex_gui_url_mod), TYPE_INT},
-	{"gui_usermenu", P_OFFINT (hex_gui_usermenu), TYPE_BOOL},
 	{"gui_win_height", P_OFFINT (hex_gui_win_height), TYPE_INT},
 	{"gui_win_fullscreen", P_OFFINT (hex_gui_win_fullscreen), TYPE_INT},
 	{"gui_win_left", P_OFFINT (hex_gui_win_left), TYPE_INT},

@@ 66,7 66,6 @@ GSList *replace_list = 0;
 GSList *sess_list = 0;
 GSList *dcc_list = 0;
 GSList *ignore_list = 0;
-GSList *usermenu_list = 0;
 GSList *urlhandler_list = 0;
 GSList *tabmenu_list = 0;
 


@@ 902,20 901,6 @@ xchat_init (void)
 	list_loadconf ("popup.conf", &popup_list, buf);
 
 	g_snprintf (buf, sizeof (buf),
-		"NAME %s\n"				"CMD part\n\n"
-		"NAME %s\n"				"CMD getstr # join \"%s\"\n\n"
-		"NAME %s\n"				"CMD quote LINKS\n\n"
-		"NAME %s\n"				"CMD ping\n\n"
-		"NAME TOGGLE %s\n"	"CMD irc_hide_version\n\n",
-				_("Leave Channel"),
-				_("Join Channel..."),
-				_("Enter Channel to Join:"),
-				_("Server Links"),
-				_("Ping Server"),
-				_("Hide Version"));
-	list_loadconf ("usermenu.conf", &usermenu_list, buf);
-
-	g_snprintf (buf, sizeof (buf),
 		"NAME %s\n"		"CMD op %%a\n\n"
 		"NAME %s\n"		"CMD deop %%a\n\n"
 		"NAME %s\n"		"CMD ban %%s\n\n"

@@ 149,7 149,6 @@ struct hexchatprefs
 	unsigned int hex_gui_ulist_icons;
 	unsigned int hex_gui_ulist_show_hosts;
 	unsigned int hex_gui_ulist_style;
-	unsigned int hex_gui_usermenu;
 	unsigned int hex_gui_win_modes;
 	unsigned int hex_gui_win_nick;
 	unsigned int hex_gui_win_save;

@@ 42,7 42,6 @@ extern GSList *replace_list;
 extern GSList *sess_list;
 extern GSList *dcc_list;
 extern GSList *ignore_list;
-extern GSList *usermenu_list;
 extern GSList *urlhandler_list;
 extern GSList *tabmenu_list;
 extern GList *sess_list_by_lastact[];

@@ 126,11 126,6 @@ editlist_save (GtkWidget *igad, gchar *file)
 		{
 			list_free (&command_list);
 			list_loadconf (file, &command_list, 0);
-		} else if (editlist_list == usermenu_list)
-		{
-			list_free (&usermenu_list);
-			list_loadconf (file, &usermenu_list, 0);
-			usermenu_update ();
 		} else
 		{
 			list_free (&urlhandler_list);

@@ 136,9 136,9 @@ fe_args (int argc, char *argv[])
 	g_option_context_parse (context, &argc, &argv, &error);
 
 #ifdef WIN32
-	if (error)											/* workaround for argv not being available when using subsystem:windows */
+	if (error)	/* workaround for argv not being available when using subsystem:windows */
 	{
-		if (error->message)								/* the error message contains argv so search for patterns in that */
+		if (error->message)	/* the error message contains argv so search for patterns in that */
 		{
 			if (strstr (error->message, "--help-all") != NULL)
 			{

@@ 1150,65 1150,6 @@ menu_settings (GtkWidget * wid, gpointer none)
 }
 
 static void
-menu_usermenu (void)
-{
-	char buf[128];
-	g_snprintf(buf, sizeof(buf), _("User menu - %s"), _(DISPLAY_NAME));
-	editlist_gui_open (NULL, NULL, usermenu_list, buf, "usermenu", "usermenu.conf", 0);
-}
-
-static void
-usermenu_create (GtkWidget *menu)
-{
-	menu_create (menu, usermenu_list, "", FALSE);
-	menu_quick_item (0, 0, menu, XCMENU_SHADED, 0, 0);	/* sep */
-	menu_quick_item_with_callback (menu_usermenu, _("Edit This Menu" ELLIPSIS), menu, 0);
-}
-
-static void
-usermenu_destroy (GtkWidget * menu)
-{
-	GList *items = ((GtkMenuShell *) menu)->children;
-	GList *next;
-
-	while (items)
-	{
-		next = items->next;
-		gtk_widget_destroy (items->data);
-		items = next;
-	}
-}
-
-void
-usermenu_update (void)
-{
-	int done_main = FALSE;
-	GSList *list = sess_list;
-	session *sess;
-	GtkWidget *menu;
-
-	while (list)
-	{
-		sess = list->data;
-		menu = sess->gui->menu_item[MENU_ID_USERMENU];
-		if (sess->gui->is_tab)
-		{
-			if (!done_main && menu)
-			{
-				usermenu_destroy (menu);
-				usermenu_create (menu);
-				done_main = TRUE;
-			}
-		} else if (menu)
-		{
-			usermenu_destroy (menu);
-			usermenu_create (menu);
-		}
-		list = list->next;
-	}
-}
-
-static void
 menu_newserver_window (GtkWidget * wid, gpointer none)
 {
 	int old = prefs.hex_gui_tab_chans;


@@ 1825,8 1766,6 @@ static struct mymenu mymenu[] = {
 #define AWAY_OFFSET (41)
 	{N_("Marked _Away"), menu_away, 0, M_MENUTOG, MENU_ID_AWAY, 0, 1, GDK_KEY_a},
 
-	{N_("_Usermenu"), 0, 0, M_NEWMENU, MENU_ID_USERMENU, 0, 1},	/* 40 */
-
 	{N_("S_ettings"), 0, 0, M_NEWMENU, 0, 0, 1},
 	{N_("_Preferences"), menu_settings, GTK_STOCK_PREFERENCES, M_MENUSTOCK, 0, 0, 1},
 	{0, 0, 0, M_SEP, 0, 0, 0},


@@ 1838,7 1777,7 @@ static struct mymenu mymenu[] = {
 	{N_("URL Handlers"), menu_urlhandlers, 0, M_MENUITEM, 0, 0, 1},
 	{N_("User Commands"), menu_usercommands, 0, M_MENUITEM, 0, 0, 1},
 	{N_("User List Buttons"), menu_ulbuttons, 0, M_MENUITEM, 0, 0, 1},
-	{N_("User List Popup"), menu_ulpopup, 0, M_MENUITEM, 0, 0, 1},	/* 52 */
+	{N_("User List Popup"), menu_ulpopup, 0, M_MENUITEM, 0, 0, 1},	/* 53 */
 
 	{N_("_Window"), 0, 0, M_NEWMENU, 0, 0, 1},
 	{N_("_Ban List"), menu_banlist, 0, M_MENUITEM, 0, 0, 1},


@@ 1856,14 1795,13 @@ static struct mymenu mymenu[] = {
 	{N_("_Copy Selection"), menu_copy_selection, 0, M_MENUITEM, 0, 0, 1, GDK_KEY_C},
 	{N_("C_lear Text"), menu_flushbuffer, GTK_STOCK_CLEAR, M_MENUSTOCK, 0, 0, 1},
 	{N_("Save Text" ELLIPSIS), menu_savebuffer, GTK_STOCK_SAVE, M_MENUSTOCK, 0, 0, 1},
-#define SEARCH_OFFSET (70)
 	{N_("Search"), 0, GTK_STOCK_JUSTIFY_LEFT, M_MENUSUB, 0, 0, 1},
 		{N_("Search Text" ELLIPSIS), menu_search, GTK_STOCK_FIND, M_MENUSTOCK, 0, 0, 1, GDK_KEY_f},
 		{N_("Search Next"   ), menu_search_next, GTK_STOCK_FIND, M_MENUSTOCK, 0, 0, 1, GDK_KEY_g},
 		{N_("Search Previous"   ), menu_search_prev, GTK_STOCK_FIND, M_MENUSTOCK, 0, 0, 1, GDK_KEY_G},
 		{0, 0, 0, M_END, 0, 0, 0},
 
-	{N_("_Help"), 0, 0, M_NEWMENU, 0, 0, 1},	/* 74 */
+	{N_("_Help"), 0, 0, M_NEWMENU, 0, 0, 1},	/* 75 */
 	{N_("_Contents"), menu_docs, GTK_STOCK_HELP, M_MENUSTOCK, 0, 0, 1, GDK_KEY_F1},
 	{N_("_About"), menu_about, GTK_STOCK_ABOUT, M_MENUSTOCK, 0, 0, 1},
 


@@ 2274,7 2212,6 @@ menu_create_main (void *accel_group, int bar, int away, int toplevel,
 	GtkWidget *menu = 0;
 	GtkWidget *menu_item = 0;
 	GtkWidget *menu_bar;
-	GtkWidget *usermenu = 0;
 	GtkWidget *submenu = 0;
 	int close_mask = STATE_CTRL;
 	int away_mask = STATE_ALT;


@@ 2350,7 2287,6 @@ menu_create_main (void *accel_group, int bar, int away, int toplevel,
 			if (!g_ascii_strcasecmp (key_theme, "Emacs"))
 			{
 				close_mask = STATE_SHIFT | STATE_CTRL;
-				mymenu[SEARCH_OFFSET].key = 0;
 			}
 			g_free (key_theme);
 		}


@@ 2378,11 2314,6 @@ menu_create_main (void *accel_group, int bar, int away, int toplevel,
 	while (1)
 	{
 		item = NULL;
-		if (mymenu[i].id == MENU_ID_USERMENU && !prefs.hex_gui_usermenu)
-		{
-			i++;
-			continue;
-		}
 
 		switch (mymenu[i].type)
 		{


@@ 2390,8 2321,6 @@ menu_create_main (void *accel_group, int bar, int away, int toplevel,
 			if (menu)
 				gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_item), menu);
 			item = menu = gtk_menu_new ();
-			if (mymenu[i].id == MENU_ID_USERMENU)
-				usermenu = menu;
 			menu_item = gtk_menu_item_new_with_mnemonic (_(mymenu[i].text));
 			/* record the English name for /menu */
 			g_object_set_data (G_OBJECT (menu_item), "name", mymenu[i].text);


@@ 2488,8 2417,6 @@ togitem:
 					gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_item), menu);
 					menu_add_plugin_mainmenu_items (menu_bar);
 				}
-				if (usermenu)
-					usermenu_create (usermenu);
 				return (menu_bar);
 			}
 			submenu = NULL;

@@ 29,7 29,6 @@ void menu_nickmenu (session *sess, GdkEventButton * event, char *nick, int num_s
 void menu_middlemenu (session *sess, GdkEventButton *event);
 void userlist_button_cb (GtkWidget * button, char *cmd);
 void nick_command_parse (session *sess, char *cmd, char *nick, char *allnick);
-void usermenu_update (void);
 GtkWidget *menu_toggle_item (char *label, GtkWidget *menu, void *callback, void *userdata, int state);
 GtkWidget *menu_quick_item (char *cmd, char *label, GtkWidget * menu, int flags, gpointer userdata, char *icon);
 GtkWidget *menu_quick_sub (char *name, GtkWidget *menu, GtkWidget **sub_item_ret, int flags, int pos);