From 2b37622e83ae150320d6aa540c79e85a2574ffd5 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Fri, 6 Sep 2013 12:27:33 +0200 Subject: Remove gmenuutils, it's not being used anymore --- src/Makefile.am | 2 -- src/gmenuutils.c | 87 -------------------------------------------------- src/gmenuutils.h | 38 ---------------------- src/messages-service.c | 1 - 4 files changed, 128 deletions(-) delete mode 100644 src/gmenuutils.c delete mode 100644 src/gmenuutils.h (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am index 8d77dea..1802786 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -10,8 +10,6 @@ indicator_messages_service_SOURCES = \ gactionmuxer.h \ gsettingsstrv.c \ gsettingsstrv.h \ - gmenuutils.c \ - gmenuutils.h \ im-menu.c \ im-menu.h \ im-phone-menu.c \ diff --git a/src/gmenuutils.c b/src/gmenuutils.c deleted file mode 100644 index cfd751e..0000000 --- a/src/gmenuutils.c +++ /dev/null @@ -1,87 +0,0 @@ -/* - * Copyright 2012 Canonical Ltd. - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 3, as published - * by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranties of - * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - * - * Authors: - * Lars Uebernickel - */ - -#include "gmenuutils.h" -#include "dbus-data.h" - -/* g_menu_find_section: - * @menu: a #GMenu - * @section: the section to be found in @menu - * - * @Returns the index of the first menu item that is linked to #section, or -1 - * if there's no such item. - */ -int -g_menu_find_section (GMenu *menu, - GMenuModel *section) -{ - GMenuModel *model = G_MENU_MODEL (menu); - int n_items; - int i; - - g_return_val_if_fail (G_IS_MENU_MODEL (section), -1); - - n_items = g_menu_model_get_n_items (model); - for (i = 0; i < n_items; i++) - { - GMenuModel *link; - gboolean found; - - link = g_menu_model_get_item_link (model, i, G_MENU_LINK_SECTION); - found = section == link; - - g_object_unref (link); - - if (found) - return i; - } - - return -1; -} - - -void -g_menu_append_with_icon (GMenu *menu, - const gchar *label, - GIcon *icon, - const gchar *detailed_action) -{ - gchar *iconstr; - - iconstr = g_icon_to_string (icon); - g_menu_append_with_icon_name (menu, label, iconstr, detailed_action); - - g_free (iconstr); -} - -void -g_menu_append_with_icon_name (GMenu *menu, - const gchar *label, - const gchar *icon_name, - const gchar *detailed_action) -{ - GMenuItem *item; - - item = g_menu_item_new (label, detailed_action); - g_menu_item_set_attribute (item, "icon", "s", icon_name); - - g_menu_append_item (menu, item); - - g_object_unref (item); -} diff --git a/src/gmenuutils.h b/src/gmenuutils.h deleted file mode 100644 index e00ac55..0000000 --- a/src/gmenuutils.h +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright 2012 Canonical Ltd. - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 3, as published - * by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranties of - * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - * - * Authors: - * Lars Uebernickel - */ - -#ifndef __G_MENU_UTILS_H__ -#define __G_MENU_UTILS_H__ - -#include - -int g_menu_find_section (GMenu *menu, - GMenuModel *section); - -void g_menu_append_with_icon (GMenu *menu, - const gchar *label, - GIcon *icon, - const gchar *detailed_action); - -void g_menu_append_with_icon_name (GMenu *menu, - const gchar *label, - const gchar *icon_name, - const gchar *detailed_action); - -#endif diff --git a/src/messages-service.c b/src/messages-service.c index a8deb6a..954fccc 100644 --- a/src/messages-service.c +++ b/src/messages-service.c @@ -29,7 +29,6 @@ with this program. If not, see . #include "dbus-data.h" #include "gsettingsstrv.h" -#include "gmenuutils.h" #include "indicator-messages-service.h" #include "indicator-messages-application.h" #include "im-phone-menu.h" -- cgit v1.2.3