[gtk+/wip/matthiasc/help-overlay] Drop remaining internal API
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/matthiasc/help-overlay] Drop remaining internal API
- Date: Fri, 16 Oct 2015 20:57:50 +0000 (UTC)
commit 5c8674b66e3c823b02d53fa0a02ef3d6b0faab14
Author: Matthias Clasen <mclasen redhat com>
Date: Fri Oct 16 16:54:31 2015 -0400
Drop remaining internal API
If we do this API-less, lets go all the way.
gtk/gtkshortcutssection.c | 65 ++++++++++++++++++--------------------------
gtk/gtkshortcutssection.h | 7 -----
gtk/gtkshortcutswindow.c | 21 +++++++++-----
3 files changed, 41 insertions(+), 52 deletions(-)
---
diff --git a/gtk/gtkshortcutssection.c b/gtk/gtkshortcutssection.c
index 5475f26..172ed09 100644
--- a/gtk/gtkshortcutssection.c
+++ b/gtk/gtkshortcutssection.c
@@ -84,11 +84,16 @@ enum {
static GParamSpec *properties[LAST_PROP];
-static void show_all_changed (GtkShortcutsSection *self);
-static void maybe_filter (GtkShortcutsSection *self);
-static void filter_groups (GtkShortcutsSection *self);
-static void reflow_groups (GtkShortcutsSection *self);
-static void maybe_reflow (GtkShortcutsSection *self);
+static void gtk_shortcuts_section_set_view_name (GtkShortcutsSection *self,
+ const gchar *view_name);
+static void gtk_shortcuts_section_add_group (GtkShortcutsSection *self,
+ GtkShortcutsGroup *group);
+
+static void gtk_shortcuts_section_show_all_changed (GtkShortcutsSection *self);
+static void gtk_shortcuts_section_filter_groups (GtkShortcutsSection *self);
+static void gtk_shortcuts_section_maybe_filter (GtkShortcutsSection *self);
+static void gtk_shortcuts_section_reflow_groups (GtkShortcutsSection *self);
+static void gtk_shortcuts_section_maybe_reflow (GtkShortcutsSection *self);
static void
@@ -97,10 +102,10 @@ gtk_shortcuts_section_map (GtkWidget *widget)
GtkShortcutsSection *self = GTK_SHORTCUTS_SECTION (widget);
if (self->need_filter)
- filter_groups (self);
+ gtk_shortcuts_section_filter_groups (self);
if (self->need_reflow)
- reflow_groups (self);
+ gtk_shortcuts_section_reflow_groups (self);
GTK_WIDGET_CLASS (gtk_shortcuts_section_parent_class)->map (widget);
}
@@ -303,7 +308,7 @@ gtk_shortcuts_section_init (GtkShortcutsSection *self)
self->show_all = gtk_toggle_button_new_with_label (_("Show All"));
gtk_widget_set_no_show_all (self->show_all, TRUE);
g_signal_connect_swapped (self->show_all, "toggled",
- G_CALLBACK (show_all_changed), self);
+ G_CALLBACK (gtk_shortcuts_section_show_all_changed), self);
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 20);
GTK_CONTAINER_CLASS (gtk_shortcuts_section_parent_class)->add (GTK_CONTAINER (self), box);
@@ -313,23 +318,7 @@ gtk_shortcuts_section_init (GtkShortcutsSection *self)
gtk_widget_set_halign (self->show_all, GTK_ALIGN_END);
}
-const gchar *
-gtk_shortcuts_section_get_section_name (GtkShortcutsSection *self)
-{
- g_return_val_if_fail (GTK_IS_SHORTCUTS_SECTION (self), NULL);
-
- return self->name;
-}
-
-const gchar *
-gtk_shortcuts_section_get_title (GtkShortcutsSection *self)
-{
- g_return_val_if_fail (GTK_IS_SHORTCUTS_SECTION (self), NULL);
-
- return self->title;
-}
-
-void
+static void
gtk_shortcuts_section_set_view_name (GtkShortcutsSection *self,
const gchar *view_name)
{
@@ -338,13 +327,13 @@ gtk_shortcuts_section_set_view_name (GtkShortcutsSection *self,
g_free (self->view_name);
self->view_name = g_strdup (view_name);
- maybe_filter (self);
- maybe_reflow (self);
+ gtk_shortcuts_section_maybe_filter (self);
+ gtk_shortcuts_section_maybe_reflow (self);
g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_VIEW_NAME]);
}
-void
+static void
gtk_shortcuts_section_add_group (GtkShortcutsSection *self,
GtkShortcutsGroup *group)
{
@@ -375,21 +364,21 @@ gtk_shortcuts_section_add_group (GtkShortcutsSection *self,
gtk_container_add (GTK_CONTAINER (column), GTK_WIDGET (group));
- maybe_reflow (self);
+ gtk_shortcuts_section_maybe_reflow (self);
}
static void
-show_all_changed (GtkShortcutsSection *self)
+gtk_shortcuts_section_show_all_changed (GtkShortcutsSection *self)
{
- maybe_filter (self);
- maybe_reflow (self);
+ gtk_shortcuts_section_maybe_filter (self);
+ gtk_shortcuts_section_maybe_reflow (self);
}
static void
-maybe_filter (GtkShortcutsSection *self)
+gtk_shortcuts_section_maybe_filter (GtkShortcutsSection *self)
{
if (gtk_widget_get_mapped (GTK_WIDGET (self)))
- filter_groups (self);
+ gtk_shortcuts_section_filter_groups (self);
else
self->need_filter = TRUE;
}
@@ -422,7 +411,7 @@ update_group_visibility (GtkWidget *child, gpointer data)
}
static void
-filter_groups (GtkShortcutsSection *self)
+gtk_shortcuts_section_filter_groups (GtkShortcutsSection *self)
{
self->has_filtered_group = FALSE;
@@ -437,10 +426,10 @@ filter_groups (GtkShortcutsSection *self)
}
static void
-maybe_reflow (GtkShortcutsSection *self)
+gtk_shortcuts_section_maybe_reflow (GtkShortcutsSection *self)
{
if (gtk_widget_get_mapped (GTK_WIDGET (self)))
- reflow_groups (self);
+ gtk_shortcuts_section_reflow_groups (self);
else
self->need_reflow = TRUE;
}
@@ -458,7 +447,7 @@ adjust_page_buttons (GtkWidget *widget,
}
static void
-reflow_groups (GtkShortcutsSection *self)
+gtk_shortcuts_section_reflow_groups (GtkShortcutsSection *self)
{
GList *pages, *p;
GList *columns, *c;
diff --git a/gtk/gtkshortcutssection.h b/gtk/gtkshortcutssection.h
index 1f3d339..9d8b5cc 100644
--- a/gtk/gtkshortcutssection.h
+++ b/gtk/gtkshortcutssection.h
@@ -38,13 +38,6 @@ typedef struct _GtkShortcutsSectionClass GtkShortcutsSectionClass;
GDK_AVAILABLE_IN_3_20
GType gtk_shortcuts_section_get_type (void) G_GNUC_CONST;
-const gchar *gtk_shortcuts_section_get_section_name (GtkShortcutsSection *self);
-const gchar *gtk_shortcuts_section_get_title (GtkShortcutsSection *self);
-void gtk_shortcuts_section_set_view_name (GtkShortcutsSection *self,
- const gchar *view_name);
-void gtk_shortcuts_section_add_group (GtkShortcutsSection *self,
- GtkShortcutsGroup *group);
-
G_END_DECLS
#endif /* __GTK_SHORTCUTS_SECTION_H__ */
diff --git a/gtk/gtkshortcutswindow.c b/gtk/gtkshortcutswindow.c
index 7a1bc48..d6d7ba8 100644
--- a/gtk/gtkshortcutswindow.c
+++ b/gtk/gtkshortcutswindow.c
@@ -150,10 +150,12 @@ update_title_stack (GtkShortcutsWindow *self)
{
if (number_of_children (GTK_CONTAINER (priv->stack)) > 3)
{
- const gchar *title;
+ gchar *title;
+
gtk_stack_set_visible_child_name (priv->title_stack, "sections");
- title = gtk_shortcuts_section_get_title (GTK_SHORTCUTS_SECTION (visible_child));
+ g_object_get (visible_child, "title", &title, NULL);
gtk_label_set_label (priv->menu_label, title);
+ g_free (title);
}
else
{
@@ -268,15 +270,17 @@ gtk_shortcuts_window_add_section (GtkShortcutsWindow *self,
{
GtkShortcutsWindowPrivate *priv = gtk_shortcuts_window_get_instance_private (self);
GtkListBoxRow *row;
- const gchar *title;
- const gchar *name;
+ gchar *title;
+ gchar *name;
const gchar *visible_section;
GtkWidget *label;
gtk_container_foreach (GTK_CONTAINER (section), gtk_shortcuts_window_add_search_item, self);
- name = gtk_shortcuts_section_get_section_name (section);
- title = gtk_shortcuts_section_get_title (section);
+ g_object_get (section,
+ "section-name", &name,
+ "title", &title,
+ NULL);
gtk_stack_add_titled (priv->stack, GTK_WIDGET (section), name, title);
@@ -299,6 +303,9 @@ gtk_shortcuts_window_add_section (GtkShortcutsWindow *self,
gtk_container_add (GTK_CONTAINER (priv->list_box), GTK_WIDGET (row));
update_title_stack (self);
+
+ g_free (name);
+ g_free (title);
}
static void
@@ -331,7 +338,7 @@ gtk_shortcuts_window_set_view_name (GtkShortcutsWindow *self,
GtkShortcutsSection *section = l->data;
if (GTK_IS_SHORTCUTS_SECTION (section))
- gtk_shortcuts_section_set_view_name (section, priv->view_name);
+ g_object_set (section, "view-name", priv->view_name, NULL);
}
g_list_free (sections);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]