From 1501b8588c33f96310cf30b39b8a75f5a55afab0 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 4 Jan 2010 16:43:53 -0500 Subject: Kill e_popup_menu(). The function is trivial and was only used from ETableHeaderItem. This also eliminates widgets/misc/e-gui-utils.[ch]. --- widgets/misc/Makefile.am | 2 -- widgets/misc/e-gui-utils.c | 55 --------------------------------------------- widgets/misc/e-gui-utils.h | 35 ----------------------------- widgets/misc/e-popup-menu.c | 1 - 4 files changed, 93 deletions(-) delete mode 100644 widgets/misc/e-gui-utils.c delete mode 100644 widgets/misc/e-gui-utils.h (limited to 'widgets/misc') diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am index 26fb25f657..0ab566c19d 100644 --- a/widgets/misc/Makefile.am +++ b/widgets/misc/Makefile.am @@ -47,7 +47,6 @@ widgetsinclude_HEADERS = \ e-combo-cell-editable.h \ e-dateedit.h \ e-focus-tracker.h \ - e-gui-utils.h \ e-hinted-entry.h \ e-hsv-utils.h \ e-image-chooser.h \ @@ -124,7 +123,6 @@ libemiscwidgets_la_SOURCES = \ e-combo-cell-editable.c \ e-dateedit.c \ e-focus-tracker.c \ - e-gui-utils.c \ e-hinted-entry.c \ e-hsv-utils.c \ e-image-chooser.c \ diff --git a/widgets/misc/e-gui-utils.c b/widgets/misc/e-gui-utils.c deleted file mode 100644 index 0974081f78..0000000000 --- a/widgets/misc/e-gui-utils.c +++ /dev/null @@ -1,55 +0,0 @@ -/* - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) version 3. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see - * - * - * Authors: - * Miguel de Icaza - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - */ - -#include - -#include -#include -#include - -#include "e-gui-utils.h" - -void -e_popup_menu (GtkMenu *menu, GdkEvent *event) -{ - g_return_if_fail (GTK_IS_MENU (menu)); - - g_signal_connect ( - menu, "selection-done", - G_CALLBACK (gtk_widget_destroy), NULL); - - if (event) { - if (event->type == GDK_KEY_PRESS) - gtk_menu_popup (menu, NULL, NULL, NULL, NULL, 0, - event->key.time); - else if ((event->type == GDK_BUTTON_PRESS) || - (event->type == GDK_BUTTON_RELEASE) || - (event->type == GDK_2BUTTON_PRESS) || - (event->type == GDK_3BUTTON_PRESS)) { - gtk_menu_popup (menu, NULL, NULL, NULL, NULL, - event->button.button, - event->button.time); - } - } else - gtk_menu_popup (menu, NULL, NULL, NULL, NULL, 0, - GDK_CURRENT_TIME); -} diff --git a/widgets/misc/e-gui-utils.h b/widgets/misc/e-gui-utils.h deleted file mode 100644 index ff05d57725..0000000000 --- a/widgets/misc/e-gui-utils.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) version 3. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see - * - * - * Authors: - * Miguel de Icaza - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - */ - -#ifndef E_GUI_UTILS_H -#define E_GUI_UTILS_H - -#include - -G_BEGIN_DECLS - -void e_popup_menu (GtkMenu *menu, - GdkEvent *event); - -G_END_DECLS - -#endif /* E_GUI_UTILS_H */ diff --git a/widgets/misc/e-popup-menu.c b/widgets/misc/e-popup-menu.c index d47d91af99..422fd47e60 100644 --- a/widgets/misc/e-popup-menu.c +++ b/widgets/misc/e-popup-menu.c @@ -30,7 +30,6 @@ #include #include -#include "e-gui-utils.h" #include "e-popup-menu.h" /* -- cgit v1.2.3