[epiphany] Adapt to changes in HdyActionRow and HdyExpanderRow



commit 8bb240df2cfbcb66ef8c17c7f40d87ee891b52fc
Author: Adrien Plazas <kekun plazas laposte net>
Date:   Tue Jul 28 13:03:13 2020 +0200

    Adapt to changes in HdyActionRow and HdyExpanderRow
    
    Both got their title property removed as they were conflicting with
    their root, HdyPreferencesRow, which already had it, so use the
    accessors from HdyPreferencesRow instead.
    
    See https://gitlab.gnome.org/GNOME/libhandy/-/issues/258

 src/ephy-history-dialog.c            | 4 ++--
 src/preferences/passwords-view.c     | 6 +++---
 src/preferences/prefs-general-page.c | 2 +-
 src/preferences/prefs-sync-page.c    | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/src/ephy-history-dialog.c b/src/ephy-history-dialog.c
index 306dc9b73..e1356348a 100644
--- a/src/ephy-history-dialog.c
+++ b/src/ephy-history-dialog.c
@@ -82,7 +82,7 @@ static EphyHistoryURL *
 get_url_from_row (GtkListBoxRow *row)
 {
   return ephy_history_url_new (hdy_action_row_get_subtitle (HDY_ACTION_ROW (row)),
-                               hdy_action_row_get_title (HDY_ACTION_ROW (row)),
+                               hdy_preferences_row_get_title (HDY_PREFERENCES_ROW (row)),
                                0,
                                0,
                                0);
@@ -248,7 +248,7 @@ create_row (EphyHistoryDialog *self,
 
   /* Row */
   row = hdy_action_row_new ();
-  hdy_action_row_set_title (HDY_ACTION_ROW (row), url->title);
+  hdy_preferences_row_set_title (HDY_PREFERENCES_ROW (row), url->title);
   hdy_action_row_set_subtitle (HDY_ACTION_ROW (row), url->url);
   gtk_list_box_row_set_activatable (GTK_LIST_BOX_ROW (row), TRUE);
   gtk_widget_set_tooltip_text (row, url->url);
diff --git a/src/preferences/passwords-view.c b/src/preferences/passwords-view.c
index 818b8ee2c..2dce7eba0 100644
--- a/src/preferences/passwords-view.c
+++ b/src/preferences/passwords-view.c
@@ -252,7 +252,7 @@ populate_model_cb (GList    *records,
 
     row = hdy_expander_row_new ();
     g_object_set_data (G_OBJECT (row), "record", record);
-    hdy_expander_row_set_title (HDY_EXPANDER_ROW (row), ephy_password_record_get_origin (record));
+    hdy_preferences_row_set_title (HDY_PREFERENCES_ROW (row), ephy_password_record_get_origin (record));
     hdy_expander_row_set_subtitle (HDY_EXPANDER_ROW (row), ephy_password_record_get_username (record));
     hdy_expander_row_set_show_enable_switch (HDY_EXPANDER_ROW (row), FALSE);
 
@@ -264,7 +264,7 @@ populate_model_cb (GList    *records,
 
     /* Username */
     sub_row = hdy_action_row_new ();
-    hdy_action_row_set_title (HDY_ACTION_ROW (sub_row), _("Username"));
+    hdy_preferences_row_set_title (HDY_PREFERENCES_ROW (sub_row), _("Username"));
     gtk_container_add (GTK_CONTAINER (row), sub_row);
 
     entry = gtk_entry_new ();
@@ -293,7 +293,7 @@ populate_model_cb (GList    *records,
 
     /* Password */
     sub_row = hdy_action_row_new ();
-    hdy_action_row_set_title (HDY_ACTION_ROW (sub_row), _("Password"));
+    hdy_preferences_row_set_title (HDY_PREFERENCES_ROW (sub_row), _("Password"));
     gtk_container_add (GTK_CONTAINER (row), sub_row);
 
     entry = gtk_entry_new ();
diff --git a/src/preferences/prefs-general-page.c b/src/preferences/prefs-general-page.c
index e64da0ebc..df2b3f8b0 100644
--- a/src/preferences/prefs-general-page.c
+++ b/src/preferences/prefs-general-page.c
@@ -482,7 +482,7 @@ language_editor_add (PrefsGeneralPage *general_page,
   }
 
   row = hdy_action_row_new ();
-  hdy_action_row_set_title (HDY_ACTION_ROW (row), desc);
+  hdy_preferences_row_set_title (HDY_PREFERENCES_ROW (row), desc);
   g_object_set_data (G_OBJECT (row), "code", g_strdup (code));
   gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (row)), "row");
 
diff --git a/src/preferences/prefs-sync-page.c b/src/preferences/prefs-sync-page.c
index 3b5e43c26..b0593d296 100644
--- a/src/preferences/prefs-sync-page.c
+++ b/src/preferences/prefs-sync-page.c
@@ -161,8 +161,8 @@ sync_secrets_store_finished_cb (EphySyncService *service,
   g_assert (EPHY_IS_PREFS_SYNC_PAGE (sync_page));
 
   if (!error) {
-    hdy_action_row_set_title (HDY_ACTION_ROW (sync_page->sync_firefox_account_row),
-                              ephy_sync_utils_get_sync_user ());
+    hdy_preferences_row_set_title (HDY_PREFERENCES_ROW (sync_page->sync_firefox_account_row),
+                                   ephy_sync_utils_get_sync_user ());
     gtk_widget_hide (sync_page->sync_page_box);
     gtk_widget_show (sync_page->sync_firefox_account_box);
     gtk_widget_show (sync_page->sync_options_box);
@@ -718,7 +718,7 @@ prefs_sync_page_setup (PrefsSyncPage *sync_page)
     gtk_widget_hide (sync_page->sync_options_box);
   } else {
     sync_set_last_sync_time (sync_page);
-    hdy_action_row_set_title (HDY_ACTION_ROW (sync_page->sync_firefox_account_row), user);
+    hdy_preferences_row_set_title (HDY_PREFERENCES_ROW (sync_page->sync_firefox_account_row), user);
     gtk_widget_hide (sync_page->sync_page_box);
   }
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]