[gnome-todo] panel: fix method name clash
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-todo] panel: fix method name clash
- Date: Tue, 19 Jan 2016 19:21:28 +0000 (UTC)
commit d7e0d8bc48dc8bf5b63d97d9e8a77d2f60391b56
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date: Tue Jan 19 17:18:47 2016 -0200
panel: fix method name clash
GtdPanel::get_name() was conflicting with GtkBuildable's
method with the same name on Python3 GObject override.
Change it so it won't conflict anymore.
plugins/eds/gtd-panel-scheduled.c | 8 ++++----
plugins/eds/gtd-panel-today.c | 8 ++++----
src/gtd-window.c | 6 +++---
src/interfaces/gtd-panel.c | 16 ++++++++--------
src/interfaces/gtd-panel.h | 8 ++++----
src/views/gtd-list-selector-panel.c | 12 ++++++------
6 files changed, 29 insertions(+), 29 deletions(-)
---
diff --git a/plugins/eds/gtd-panel-scheduled.c b/plugins/eds/gtd-panel-scheduled.c
index b55c81e..dbfe771 100644
--- a/plugins/eds/gtd-panel-scheduled.c
+++ b/plugins/eds/gtd-panel-scheduled.c
@@ -274,13 +274,13 @@ gtd_panel_scheduled_count_tasks (GtdPanelScheduled *panel)
* GtdPanel iface init
**********************/
static const gchar*
-gtd_panel_scheduled_get_name (GtdPanel *panel)
+gtd_panel_scheduled_get_panel_name (GtdPanel *panel)
{
return GTD_PANEL_SCHEDULED_NAME;
}
static const gchar*
-gtd_panel_scheduled_get_title (GtdPanel *panel)
+gtd_panel_scheduled_get_panel_title (GtdPanel *panel)
{
return GTD_PANEL_SCHEDULED (panel)->title;
}
@@ -300,8 +300,8 @@ gtd_panel_scheduled_get_menu (GtdPanel *panel)
static void
gtd_panel_iface_init (GtdPanelInterface *iface)
{
- iface->get_name = gtd_panel_scheduled_get_name;
- iface->get_title = gtd_panel_scheduled_get_title;
+ iface->get_panel_name = gtd_panel_scheduled_get_panel_name;
+ iface->get_panel_title = gtd_panel_scheduled_get_panel_title;
iface->get_header_widgets = gtd_panel_scheduled_get_header_widgets;
iface->get_menu = gtd_panel_scheduled_get_menu;
}
diff --git a/plugins/eds/gtd-panel-today.c b/plugins/eds/gtd-panel-today.c
index 1325e97..7a698e0 100644
--- a/plugins/eds/gtd-panel-today.c
+++ b/plugins/eds/gtd-panel-today.c
@@ -196,13 +196,13 @@ gtd_panel_today_update_today_timeout_cb (GtdPanelToday *panel)
* GtdPanel iface init
**********************/
static const gchar*
-gtd_panel_today_get_name (GtdPanel *panel)
+gtd_panel_today_get_panel_name (GtdPanel *panel)
{
return GTD_PANEL_TODAY_NAME;
}
static const gchar*
-gtd_panel_today_get_title (GtdPanel *panel)
+gtd_panel_today_get_panel_title (GtdPanel *panel)
{
return GTD_PANEL_TODAY (panel)->title;
}
@@ -222,8 +222,8 @@ gtd_panel_today_get_menu (GtdPanel *panel)
static void
gtd_panel_iface_init (GtdPanelInterface *iface)
{
- iface->get_name = gtd_panel_today_get_name;
- iface->get_title = gtd_panel_today_get_title;
+ iface->get_panel_name = gtd_panel_today_get_panel_name;
+ iface->get_panel_title = gtd_panel_today_get_panel_title;
iface->get_header_widgets = gtd_panel_today_get_header_widgets;
iface->get_menu = gtd_panel_today_get_menu;
}
diff --git a/src/gtd-window.c b/src/gtd-window.c
index 4679da9..a097df6 100644
--- a/src/gtd-window.c
+++ b/src/gtd-window.c
@@ -297,7 +297,7 @@ gtd_window__panel_title_changed (GObject *object,
gtk_container_child_set (GTK_CONTAINER (priv->stack),
GTK_WIDGET (object),
- "title", gtd_panel_get_title (GTD_PANEL (object)),
+ "title", gtd_panel_get_panel_title (GTD_PANEL (object)),
NULL);
}
@@ -310,8 +310,8 @@ gtd_window__panel_added (GtdManager *manager,
gtk_stack_add_titled (priv->stack,
GTK_WIDGET (panel),
- gtd_panel_get_name (panel),
- gtd_panel_get_title (panel));
+ gtd_panel_get_panel_name (panel),
+ gtd_panel_get_panel_title (panel));
g_signal_connect (panel,
"notify::title",
diff --git a/src/interfaces/gtd-panel.c b/src/interfaces/gtd-panel.c
index d6659fd..ad79bb9 100644
--- a/src/interfaces/gtd-panel.c
+++ b/src/interfaces/gtd-panel.c
@@ -76,7 +76,7 @@ gtd_panel_default_init (GtdPanelInterface *iface)
}
/**
- * gtd_panel_get_name:
+ * gtd_panel_get_panel_name:
* @panel: a #GtdPanel
*
* Retrieves the name of @panel
@@ -84,16 +84,16 @@ gtd_panel_default_init (GtdPanelInterface *iface)
* Returns: (transfer none): the name of @panel
*/
const gchar*
-gtd_panel_get_name (GtdPanel *panel)
+gtd_panel_get_panel_name (GtdPanel *panel)
{
g_return_val_if_fail (GTD_IS_PANEL (panel), NULL);
- g_return_val_if_fail (GTD_PANEL_GET_IFACE (panel)->get_name, NULL);
+ g_return_val_if_fail (GTD_PANEL_GET_IFACE (panel)->get_panel_name, NULL);
- return GTD_PANEL_GET_IFACE (panel)->get_name (panel);
+ return GTD_PANEL_GET_IFACE (panel)->get_panel_name (panel);
}
/**
- * gtd_panel_get_title:
+ * gtd_panel_get_panel_title:
* @panel: a #GtdPanel
*
* Retrieves the title of @panel
@@ -101,12 +101,12 @@ gtd_panel_get_name (GtdPanel *panel)
* Returns: (transfer none): the title of @panel
*/
const gchar*
-gtd_panel_get_title (GtdPanel *panel)
+gtd_panel_get_panel_title (GtdPanel *panel)
{
g_return_val_if_fail (GTD_IS_PANEL (panel), NULL);
- g_return_val_if_fail (GTD_PANEL_GET_IFACE (panel)->get_title, NULL);
+ g_return_val_if_fail (GTD_PANEL_GET_IFACE (panel)->get_panel_title, NULL);
- return GTD_PANEL_GET_IFACE (panel)->get_title (panel);
+ return GTD_PANEL_GET_IFACE (panel)->get_panel_title (panel);
}
/**
diff --git a/src/interfaces/gtd-panel.h b/src/interfaces/gtd-panel.h
index 58cb803..00cfeb7 100644
--- a/src/interfaces/gtd-panel.h
+++ b/src/interfaces/gtd-panel.h
@@ -33,18 +33,18 @@ struct _GtdPanelInterface
{
GTypeInterface parent;
- const gchar* (*get_name) (GtdPanel *panel);
+ const gchar* (*get_panel_name) (GtdPanel *panel);
- const gchar* (*get_title) (GtdPanel *panel);
+ const gchar* (*get_panel_title) (GtdPanel *panel);
GList* (*get_header_widgets) (GtdPanel *panel);
const GMenu* (*get_menu) (GtdPanel *panel);
};
-const gchar* gtd_panel_get_name (GtdPanel *panel);
+const gchar* gtd_panel_get_panel_name (GtdPanel *panel);
-const gchar* gtd_panel_get_title (GtdPanel *panel);
+const gchar* gtd_panel_get_panel_title (GtdPanel *panel);
GList* gtd_panel_get_header_widgets (GtdPanel *panel);
diff --git a/src/views/gtd-list-selector-panel.c b/src/views/gtd-list-selector-panel.c
index 4e80d56..f22ac1f 100644
--- a/src/views/gtd-list-selector-panel.c
+++ b/src/views/gtd-list-selector-panel.c
@@ -423,13 +423,13 @@ gtd_list_selector_panel_get_menu (GtdPanel *panel)
}
static const gchar*
-gtd_list_selector_panel_get_name (GtdPanel *panel)
+gtd_list_selector_panel_get_panel_name (GtdPanel *panel)
{
return "panel-lists";
}
static const gchar*
-gtd_list_selector_panel_get_title (GtdPanel *panel)
+gtd_list_selector_panel_get_panel_title (GtdPanel *panel)
{
return _("Lists");
}
@@ -439,8 +439,8 @@ gtd_panel_iface_init (GtdPanelInterface *iface)
{
iface->get_header_widgets = gtd_list_selector_panel_get_header_widgets;
iface->get_menu = gtd_list_selector_panel_get_menu;
- iface->get_name = gtd_list_selector_panel_get_name;
- iface->get_title = gtd_list_selector_panel_get_title;
+ iface->get_panel_name = gtd_list_selector_panel_get_panel_name;
+ iface->get_panel_title = gtd_list_selector_panel_get_panel_title;
}
static void
@@ -466,11 +466,11 @@ gtd_list_selector_panel_get_property (GObject *object,
break;
case PROP_NAME:
- g_value_set_string (value, gtd_list_selector_panel_get_name (self));
+ g_value_set_string (value, gtd_list_selector_panel_get_panel_name (self));
break;
case PROP_TITLE:
- g_value_set_string (value, gtd_list_selector_panel_get_title (self));
+ g_value_set_string (value, gtd_list_selector_panel_get_panel_title (self));
break;
default:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]