changeset
Replace libhandy with libadwaita
Thu, 10 Feb 2022 20:41:13 -0600
- author
- Gary Kramlich <grim@reaperworld.com>
- date
- Thu, 10 Feb 2022 20:41:13 -0600
- branch
- gtk4
- changeset 41520
- a5dd595361b4
- parent 41519
- 4dcf742979d3
- child 41521
- 72cc2e4e12f5
Replace libhandy with libadwaita
This actually fixes a ton of errors as libhandy requires gtk3, so we ended up with a ton of symbols being redefined and all that. So with this change, that all goes away.
Testing Done:
Compiled and verified that there was no mention of `handy`, `hdy`, `Hdy`, or `HDY` in the output.
Reviewed at https://reviews.imfreedom.org/r/1294/
--- a/meson.build Fri Feb 04 02:01:01 2022 -0600 +++ b/meson.build Thu Feb 10 20:41:13 2022 -0600 @@ -257,7 +257,7 @@ ####################################################################### if get_option('gtkui') gtk = dependency('gtk4', version : '>= 4.0.0') - libhandy = dependency('libhandy-1', version : '>= 1') + libadwaita = dependency('libadwaita-1', version : '>= 1') talkatu_dep = dependency('talkatu', version: '>=0.1.0',
--- a/pidgin/meson.build Fri Feb 04 02:01:01 2022 -0600 +++ b/pidgin/meson.build Thu Feb 10 20:41:13 2022 -0600 @@ -223,7 +223,7 @@ gtk, IOKIT, json, - libhandy, + libadwaita, math, nice, libsoup, @@ -256,7 +256,7 @@ include_directories : [toplevel_inc, libpidgin_inc], link_with : libpidgin, sources : libpidgin_built_headers, - dependencies : [gtk, glib, libhandy, math, talkatu_dep, gplugin_gtk_dep]) + dependencies : [gtk, glib, libadwaita, math, talkatu_dep, gplugin_gtk_dep]) pidgin = executable('pidgin3', pidgin_SOURCES, @@ -276,7 +276,7 @@ filebase : pidgin_filebase, subdirs : pidgin_filebase, # NOTE: Don't use dependencies from subprojects. - requires : [gtk, libhandy, libpurple, 'talkatu', 'gplugin-gtk4'], + requires : [gtk, libadwaita, libpurple, 'talkatu', 'gplugin-gtk4'], variables : ['plugindir=${libdir}/pidgin-@0@'.format(purple_major_version)]) PIDGIN_DESKTOP_FILE = 'im.pidgin.Pidgin3.desktop'
--- a/pidgin/pidginapplication.c Fri Feb 04 02:01:01 2022 -0600 +++ b/pidgin/pidginapplication.c Thu Feb 10 20:41:13 2022 -0600 @@ -31,7 +31,7 @@ #include <gplugin.h> #include <purple.h> -#include <handy.h> +#include <adwaita.h> #include "pidginapplication.h" @@ -685,7 +685,7 @@ gpointer handle = NULL; G_APPLICATION_CLASS(pidgin_application_parent_class)->startup(application); - hdy_init(); + adw_init(); /* set a user-specified config directory */ if (opt_config_dir_arg != NULL) {
--- a/pidgin/prefs/pidgincredentialprefs.c Fri Feb 04 02:01:01 2022 -0600 +++ b/pidgin/prefs/pidgincredentialprefs.c Thu Feb 10 20:41:13 2022 -0600 @@ -22,20 +22,20 @@ #include <purple.h> -#include <handy.h> +#include <adwaita.h> #include "pidgincredentialprefs.h" #include "pidgincredentialproviderrow.h" struct _PidginCredentialPrefs { - HdyPreferencesPage parent; + AdwPreferencesPage parent; GtkWidget *credential_list; }; G_DEFINE_TYPE(PidginCredentialPrefs, pidgin_credential_prefs, - HDY_TYPE_PREFERENCES_PAGE) + ADW_TYPE_PREFERENCES_PAGE) /****************************************************************************** * Helpers
--- a/pidgin/prefs/pidgincredentialprefs.h Fri Feb 04 02:01:01 2022 -0600 +++ b/pidgin/prefs/pidgincredentialprefs.h Thu Feb 10 20:41:13 2022 -0600 @@ -30,7 +30,7 @@ #include <glib.h> #include <gtk/gtk.h> -#include <handy.h> +#include <adwaita.h> G_BEGIN_DECLS @@ -43,7 +43,7 @@ */ #define PIDGIN_TYPE_CREDENTIAL_PREFS (pidgin_credential_prefs_get_type()) G_DECLARE_FINAL_TYPE(PidginCredentialPrefs, pidgin_credential_prefs, - PIDGIN, CREDENTIAL_PREFS, HdyPreferencesPage) + PIDGIN, CREDENTIAL_PREFS, AdwPreferencesPage) /** * PidginCredentialPrefs:
--- a/pidgin/prefs/pidgincredentialproviderrow.c Fri Feb 04 02:01:01 2022 -0600 +++ b/pidgin/prefs/pidgincredentialproviderrow.c Thu Feb 10 20:41:13 2022 -0600 @@ -22,12 +22,12 @@ #include <purple.h> -#include <handy.h> +#include <adwaita.h> #include "pidgincredentialproviderrow.h" struct _PidginCredentialProviderRow { - HdyActionRow parent; + AdwActionRow parent; PurpleCredentialProvider *provider; @@ -44,7 +44,7 @@ static GParamSpec *properties[N_PROPERTIES] = {NULL, }; G_DEFINE_TYPE(PidginCredentialProviderRow, pidgin_credential_provider_row, - HDY_TYPE_ACTION_ROW) + ADW_TYPE_ACTION_ROW) /****************************************************************************** * Helpers @@ -58,11 +58,11 @@ } if(PURPLE_IS_CREDENTIAL_PROVIDER(provider)) { - hdy_preferences_row_set_title( - HDY_PREFERENCES_ROW(row), + adw_preferences_row_set_title( + ADW_PREFERENCES_ROW(row), purple_credential_provider_get_name(provider)); - hdy_action_row_set_subtitle( - HDY_ACTION_ROW(row), + adw_action_row_set_subtitle( + ADW_ACTION_ROW(row), purple_credential_provider_get_description(provider)); /* Not implemented yet, so always hide the configure button. */ gtk_widget_set_visible(row->configure, FALSE);
--- a/pidgin/prefs/pidgincredentialproviderrow.h Fri Feb 04 02:01:01 2022 -0600 +++ b/pidgin/prefs/pidgincredentialproviderrow.h Thu Feb 10 20:41:13 2022 -0600 @@ -31,7 +31,7 @@ #include <gtk/gtk.h> -#include <handy.h> +#include <adwaita.h> G_BEGIN_DECLS @@ -45,7 +45,7 @@ #define PIDGIN_TYPE_CREDENTIAL_PROVIDER_ROW (pidgin_credential_provider_row_get_type()) G_DECLARE_FINAL_TYPE(PidginCredentialProviderRow, pidgin_credential_provider_row, - PIDGIN, CREDENTIAL_PROVIDER_ROW, HdyActionRow) + PIDGIN, CREDENTIAL_PROVIDER_ROW, AdwActionRow) /** * PidginCredentialProviderRow:
--- a/pidgin/resources/Prefs/credentialprovider.ui Fri Feb 04 02:01:01 2022 -0600 +++ b/pidgin/resources/Prefs/credentialprovider.ui Thu Feb 10 20:41:13 2022 -0600 @@ -21,7 +21,7 @@ --> <interface> <requires lib="gtk+" version="3.22"/> - <requires lib="libhandy" version="0.0"/> + <requires lib="libadwaita" version="0.0"/> <!-- interface-license-type gplv2 --> <!-- interface-name Pidgin --> <!-- interface-description Internet Messenger --> @@ -31,7 +31,7 @@ <property name="can-focus">False</property> <property name="icon-name">document-properties-symbolic</property> </object> - <template class="PidginCredentialProviderRow" parent="HdyActionRow"> + <template class="PidginCredentialProviderRow" parent="AdwActionRow"> <property name="visible">True</property> <property name="can-focus">True</property> <property name="activatable">True</property>
--- a/pidgin/resources/Prefs/credentials.ui Fri Feb 04 02:01:01 2022 -0600 +++ b/pidgin/resources/Prefs/credentials.ui Thu Feb 10 20:41:13 2022 -0600 @@ -21,17 +21,17 @@ --> <interface> <requires lib="gtk+" version="3.22"/> - <requires lib="libhandy" version="0.0"/> + <requires lib="libadwaita" version="0.0"/> <!-- interface-license-type gplv2 --> <!-- interface-name Pidgin --> <!-- interface-description Internet Messenger --> <!-- interface-copyright Pidgin Developers <devel@pidgin.im> --> - <template class="PidginCredentialPrefs" parent="HdyPreferencesPage"> + <template class="PidginCredentialPrefs" parent="AdwPreferencesPage"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="title" translatable="yes">Credentials</property> <child> - <object class="HdyPreferencesGroup"> + <object class="AdwPreferencesGroup"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="description" translatable="yes">Pidgin does not store passwords directly, but uses the provider selected below to store passwords. Changing providers will not migrate existing stored passwords.</property>
