[recipes] Stop exporting set_active_row
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [recipes] Stop exporting set_active_row
- Date: Sun, 28 May 2017 02:10:03 +0000 (UTC)
commit 49e5f4db71a65a0a3cfe67c7f5d7b27f331dd28c
Author: Matthias Clasen <mclasen redhat com>
Date: Sat May 27 21:57:20 2017 -0400
Stop exporting set_active_row
We don't need it; the edit signal already does exactly what we need.
src/gr-ingredients-viewer-row.c | 10 ----------
src/gr-ingredients-viewer.c | 4 +++-
src/gr-ingredients-viewer.h | 3 ---
3 files changed, 3 insertions(+), 14 deletions(-)
---
diff --git a/src/gr-ingredients-viewer-row.c b/src/gr-ingredients-viewer-row.c
index 5b9aeea..854a163 100644
--- a/src/gr-ingredients-viewer-row.c
+++ b/src/gr-ingredients-viewer-row.c
@@ -280,14 +280,8 @@ emit_delete (GrIngredientsViewerRow *row)
static void
edit_ingredient (GrIngredientsViewerRow *row)
{
- GrIngredientsViewer *viewer;
-
- viewer = GR_INGREDIENTS_VIEWER (gtk_widget_get_ancestor (GTK_WIDGET (row),
GR_TYPE_INGREDIENTS_VIEWER));
-
if (row->editable) {
save_unit (row);
-
- set_active_row (viewer, GTK_WIDGET (row));
gtk_entry_set_text (GTK_ENTRY (row->ingredient_entry), row->ingredient);
gtk_stack_set_visible_child_name (GTK_STACK (row->ingredient_stack), "ingredient_entry");
gtk_widget_grab_focus (row->ingredient_entry);
@@ -313,19 +307,15 @@ edit_unit (GrIngredientsViewerRow *row)
const char *amount;
const char *space;
const char *unit;
- GrIngredientsViewer *viewer;
amount = row->amount ? row->amount : "";
space = amount[0] ? " " : "";
unit = row->unit ? row->unit : "";
tmp = g_strdup_printf ("%s%s%s", amount, space, unit);
- viewer = GR_INGREDIENTS_VIEWER (gtk_widget_get_ancestor (GTK_WIDGET (row),
GR_TYPE_INGREDIENTS_VIEWER));
-
save_ingredient (row);
if (row->editable) {
- set_active_row (viewer, GTK_WIDGET (row));
gtk_entry_set_text (GTK_ENTRY (row->unit_entry), tmp);
gtk_stack_set_visible_child_name (GTK_STACK (row->unit_stack), "unit_entry");
gtk_widget_grab_focus (row->unit_entry);
diff --git a/src/gr-ingredients-viewer.c b/src/gr-ingredients-viewer.c
index 33441c3..94cea86 100644
--- a/src/gr-ingredients-viewer.c
+++ b/src/gr-ingredients-viewer.c
@@ -86,7 +86,7 @@ gr_ingredients_viewer_finalize (GObject *object)
G_OBJECT_CLASS (gr_ingredients_viewer_parent_class)->finalize (object);
}
-void
+static void
set_active_row (GrIngredientsViewer *viewer,
GtkWidget *row)
{
@@ -257,10 +257,12 @@ move_row (GtkWidget *source,
g_object_notify (G_OBJECT (viewer), "ingredients");
}
+
static void
edit_ingredient_row (GrIngredientsViewerRow *row,
GrIngredientsViewer *viewer)
{
+ set_active_row (viewer, GTK_WIDGET (row));
g_object_notify (G_OBJECT (viewer), "ingredients");
}
diff --git a/src/gr-ingredients-viewer.h b/src/gr-ingredients-viewer.h
index 0bf8117..e02c665 100644
--- a/src/gr-ingredients-viewer.h
+++ b/src/gr-ingredients-viewer.h
@@ -28,9 +28,6 @@ G_BEGIN_DECLS
G_DECLARE_FINAL_TYPE (GrIngredientsViewer, gr_ingredients_viewer, GR, INGREDIENTS_VIEWER, GtkBox)
-void set_active_row (GrIngredientsViewer *viewer,
- GtkWidget *row);
-
GtkWidget *gr_ingredients_viewer_has_error (GrIngredientsViewer *viewer);
void gr_ingredients_viewer_set_drag_row (GrIngredientsViewer *viewer,
GtkWidget *row);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]