applications/gnome-control-center
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use GtkDialog instead of HdyDialog

Browse source 
HdyDialog has been dropped in libhandy 1.
This commit is contained in:
Adrien Plazas 2020-07-03 09:41:19 +02:00
parent 726684e9e0
commit 9e2a2836d9
14 changed files with 21 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

4
panels/common/cc-language-chooser.c
View file

@ -37,7 +37,7 @@
#include <libgnome-desktop/gnome-languages.h> #include <libgnome-desktop/gnome-languages.h>
struct _CcLanguageChooser { struct _CcLanguageChooser {
HdyDialog parent_instance; GtkDialog parent_instance;
GtkWidget *select_button; GtkWidget *select_button;
GtkWidget *no_results; GtkWidget *no_results;
@ -50,7 +50,7 @@ struct _CcLanguageChooser {
gchar **filter_words; gchar **filter_words;
}; };
G_DEFINE_TYPE (CcLanguageChooser, cc_language_chooser, HDY_TYPE_DIALOG) G_DEFINE_TYPE (CcLanguageChooser, cc_language_chooser, GTK_TYPE_DIALOG)
static GtkWidget * static GtkWidget *
language_widget_new (const gchar *locale_id, language_widget_new (const gchar *locale_id,

5
panels/common/cc-language-chooser.h
View file

@ -23,13 +23,10 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <glib-object.h> #include <glib-object.h>
#define HANDY_USE_UNSTABLE_API
#include <handy.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define CC_TYPE_LANGUAGE_CHOOSER (cc_language_chooser_get_type ()) #define CC_TYPE_LANGUAGE_CHOOSER (cc_language_chooser_get_type ())
G_DECLARE_FINAL_TYPE (CcLanguageChooser, cc_language_chooser, CC, LANGUAGE_CHOOSER, HdyDialog) G_DECLARE_FINAL_TYPE (CcLanguageChooser, cc_language_chooser, CC, LANGUAGE_CHOOSER, GtkDialog)
CcLanguageChooser *cc_language_chooser_new (void); CcLanguageChooser *cc_language_chooser_new (void);
void cc_language_chooser_clear_filter (CcLanguageChooser *chooser); void cc_language_chooser_clear_filter (CcLanguageChooser *chooser);

2
panels/common/cc-language-chooser.ui
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<interface> <interface>
<!-- interface-requires gtk+ 3.0 --> <!-- interface-requires gtk+ 3.0 -->
<template class="CcLanguageChooser" parent="HdyDialog"> <template class="CcLanguageChooser" parent="GtkDialog">
<property name="title" translatable="yes">Select Language</property> <property name="title" translatable="yes">Select Language</property>
<property name="modal">True</property> <property name="modal">True</property>
<property name="destroy_with_parent">True</property> <property name="destroy_with_parent">True</property>

2
panels/info-overview/cc-info-overview-panel.ui
View file

@ -184,7 +184,7 @@
</child> </child>
</template> </template>
<object class="HdyDialog" id="hostname_editor"> <object class="GtkDialog" id="hostname_editor">
<property name="visible">False</property> <property name="visible">False</property>
<property name="modal">True</property> <property name="modal">True</property>
<property name="use-header-bar">1</property> <property name="use-header-bar">1</property>

5
panels/network/net-device-wifi.c
View file

@ -21,9 +21,6 @@
#include "config.h" #include "config.h"
#define HANDY_USE_UNSTABLE_API
#include <handy.h>
#include <glib-object.h> #include <glib-object.h>
#include <glib/gi18n.h> #include <glib/gi18n.h>
@ -1059,7 +1056,7 @@ history_button_clicked_cb (NetDeviceWifi *self)
GtkWidget *list; GtkWidget *list;
GList *list_rows; GList *list_rows;
dialog = g_object_new (HDY_TYPE_DIALOG, "use-header-bar", 1, NULL); dialog = g_object_new (GTK_TYPE_DIALOG, "use-header-bar", 1, NULL);
window = gtk_widget_get_toplevel (GTK_WIDGET (self)); window = gtk_widget_get_toplevel (GTK_WIDGET (self));
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (window)); gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (window));
gtk_window_set_title (GTK_WINDOW (dialog), _("Known Wi-Fi Networks")); gtk_window_set_title (GTK_WINDOW (dialog), _("Known Wi-Fi Networks"));

4
panels/notifications/cc-app-notifications-dialog.c
View file

@ -49,7 +49,7 @@ static void update_sound_switch (CcAppNotificationsDialog *dialog);
static void update_notification_switch (CcAppNotificationsDialog *dialog); static void update_notification_switch (CcAppNotificationsDialog *dialog);
struct _CcAppNotificationsDialog { struct _CcAppNotificationsDialog {
HdyDialog parent; GtkDialog parent;
GSettings *settings; GSettings *settings;
GSettings *master_settings; GSettings *master_settings;
@ -65,7 +65,7 @@ struct _CcAppNotificationsDialog {
GtkWidget *lock_screen_content_switch; GtkWidget *lock_screen_content_switch;
}; };
G_DEFINE_TYPE (CcAppNotificationsDialog, cc_app_notifications_dialog, HDY_TYPE_DIALOG) G_DEFINE_TYPE (CcAppNotificationsDialog, cc_app_notifications_dialog, GTK_TYPE_DIALOG)
static void static void
on_perm_store_set_done (GObject *source_object, on_perm_store_set_done (GObject *source_object,

5
panels/notifications/cc-app-notifications-dialog.h
View file

@ -20,14 +20,11 @@
#pragma once #pragma once
#include <gtk/gtk.h> #include <gtk/gtk.h>
#define HANDY_USE_UNSTABLE_API
#include <handy.h>
#undef HANDY_USE_UNSTABLE_API
G_BEGIN_DECLS G_BEGIN_DECLS
#define CC_TYPE_APP_NOTIFICATIONS_DIALOG (cc_app_notifications_dialog_get_type ()) #define CC_TYPE_APP_NOTIFICATIONS_DIALOG (cc_app_notifications_dialog_get_type ())
G_DECLARE_FINAL_TYPE (CcAppNotificationsDialog, cc_app_notifications_dialog, CC, APP_NOTIFICATIONS_DIALOG, HdyDialog) G_DECLARE_FINAL_TYPE (CcAppNotificationsDialog, cc_app_notifications_dialog, CC, APP_NOTIFICATIONS_DIALOG, GtkDialog)
CcAppNotificationsDialog *cc_app_notifications_dialog_new (const gchar *app_id, CcAppNotificationsDialog *cc_app_notifications_dialog_new (const gchar *app_id,
const gchar *title, const gchar *title,

2
panels/notifications/cc-app-notifications-dialog.ui
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<interface> <interface>
<template class="CcAppNotificationsDialog" parent="HdyDialog"> <template class="CcAppNotificationsDialog" parent="GtkDialog">
<property name="width_request">360</property> <property name="width_request">360</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="modal">True</property> <property name="modal">True</property>

7
panels/region/cc-format-chooser.c
View file

@ -35,8 +35,11 @@
#define GNOME_DESKTOP_USE_UNSTABLE_API #define GNOME_DESKTOP_USE_UNSTABLE_API
#include <libgnome-desktop/gnome-languages.h> #include <libgnome-desktop/gnome-languages.h>
#define HANDY_USE_UNSTABLE_API
#include <handy.h>
struct _CcFormatChooser { struct _CcFormatChooser {
HdyDialog parent_instance; GtkDialog parent_instance;
GtkWidget *title_bar; GtkWidget *title_bar;
GtkWidget *title_buttons; GtkWidget *title_buttons;
@ -66,7 +69,7 @@ struct _CcFormatChooser {
gchar **filter_words; gchar **filter_words;
}; };
G_DEFINE_TYPE (CcFormatChooser, cc_format_chooser, HDY_TYPE_DIALOG) G_DEFINE_TYPE (CcFormatChooser, cc_format_chooser, GTK_TYPE_DIALOG)
static void static void
display_date (GtkWidget *label, GDateTime *dt, const gchar *format) display_date (GtkWidget *label, GDateTime *dt, const gchar *format)

4
panels/region/cc-format-chooser.h
View file

@ -21,13 +21,11 @@
#pragma once #pragma once
#include <gtk/gtk.h> #include <gtk/gtk.h>
#define HANDY_USE_UNSTABLE_API
#include <handy.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define CC_TYPE_FORMAT_CHOOSER (cc_format_chooser_get_type ()) #define CC_TYPE_FORMAT_CHOOSER (cc_format_chooser_get_type ())
G_DECLARE_FINAL_TYPE (CcFormatChooser, cc_format_chooser, CC, FORMAT_CHOOSER, HdyDialog) G_DECLARE_FINAL_TYPE (CcFormatChooser, cc_format_chooser, CC, FORMAT_CHOOSER, GtkDialog)
CcFormatChooser *cc_format_chooser_new (void); CcFormatChooser *cc_format_chooser_new (void);
void cc_format_chooser_clear_filter (CcFormatChooser *chooser); void cc_format_chooser_clear_filter (CcFormatChooser *chooser);

2
panels/region/cc-format-chooser.ui
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<interface> <interface>
<!-- interface-requires gtk+ 3.0 --> <!-- interface-requires gtk+ 3.0 -->
<template class="CcFormatChooser" parent="HdyDialog"> <template class="CcFormatChooser" parent="GtkDialog">
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="title" translatable="yes">Formats</property> <property name="title" translatable="yes">Formats</property>
<property name="type_hint">dialog</property> <property name="type_hint">dialog</property>

4
panels/search/cc-search-locations-dialog.c
View file

@ -43,7 +43,7 @@ typedef struct {
} Place; } Place;
struct _CcSearchLocationsDialog { struct _CcSearchLocationsDialog {
HdyDialog parent; GtkDialog parent;
GSettings *tracker_preferences; GSettings *tracker_preferences;
@ -57,7 +57,7 @@ struct _CcSearchLocationsDialogClass {
GtkDialogClass parent_class; GtkDialogClass parent_class;
}; };
G_DEFINE_TYPE (CcSearchLocationsDialog, cc_search_locations_dialog, HDY_TYPE_DIALOG) G_DEFINE_TYPE (CcSearchLocationsDialog, cc_search_locations_dialog, GTK_TYPE_DIALOG)
static void static void
cc_search_locations_dialog_finalize (GObject *object) cc_search_locations_dialog_finalize (GObject *object)

6
panels/search/cc-search-locations-dialog.h
View file

@ -20,14 +20,10 @@
#pragma once #pragma once
#define HANDY_USE_UNSTABLE_API
#include <handy.h>
#undef HANDY_USE_UNSTABLE_API
#include "cc-search-panel.h" #include "cc-search-panel.h"
#define CC_SEARCH_LOCATIONS_DIALOG_TYPE (cc_search_locations_dialog_get_type ()) #define CC_SEARCH_LOCATIONS_DIALOG_TYPE (cc_search_locations_dialog_get_type ())
G_DECLARE_FINAL_TYPE (CcSearchLocationsDialog, cc_search_locations_dialog, CC, SEARCH_LOCATIONS_DIALOG, HdyDialog) G_DECLARE_FINAL_TYPE (CcSearchLocationsDialog, cc_search_locations_dialog, CC, SEARCH_LOCATIONS_DIALOG, GtkDialog)
CcSearchLocationsDialog *cc_search_locations_dialog_new (CcSearchPanel *panel); CcSearchLocationsDialog *cc_search_locations_dialog_new (CcSearchPanel *panel);

2
panels/search/cc-search-locations-dialog.ui
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<interface> <interface>
<!-- interface-requires gtk+ 3.0 --> <!-- interface-requires gtk+ 3.0 -->
<template class="CcSearchLocationsDialog" parent="HdyDialog"> <template class="CcSearchLocationsDialog" parent="GtkDialog">
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="default_height">400</property> <property name="default_height">400</property>
<property name="default_width">360</property> <property name="default_width">360</property>