[file-roller] Use G_DECLARE_TYPE boilerplate for Gtk+ classes
- From: Paolo Bacchilega <paobac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [file-roller] Use G_DECLARE_TYPE boilerplate for Gtk+ classes
- Date: Thu, 1 Nov 2018 06:39:08 +0000 (UTC)
commit c6c0ecb3d092761693d3fc29d57975862adc4267
Author: Robert Ancell <robert ancell canonical com>
Date: Fri Oct 5 15:44:25 2018 +1300
Use G_DECLARE_TYPE boilerplate for Gtk+ classes
src/fr-application.c | 50 +++++++++----------
src/fr-application.h | 21 +-------
src/fr-file-selector-dialog.c | 112 +++++++++++++++++++++---------------------
src/fr-file-selector-dialog.h | 21 +-------
src/fr-list-model.c | 7 ++-
src/fr-list-model.h | 16 +-----
src/fr-location-bar.c | 11 ++---
src/fr-location-bar.h | 21 +-------
src/fr-new-archive-dialog.c | 94 +++++++++++++++++------------------
src/fr-new-archive-dialog.h | 21 +-------
10 files changed, 139 insertions(+), 235 deletions(-)
---
diff --git a/src/fr-application.c b/src/fr-application.c
index 1cb52c9d..c148c4f9 100644
--- a/src/fr-application.c
+++ b/src/fr-application.c
@@ -342,15 +342,16 @@ static const GDBusInterfaceVTable interface_vtable = {
/* -- main application -- */
-G_DEFINE_TYPE (FrApplication, fr_application, GTK_TYPE_APPLICATION)
+struct _FrApplication {
+ GtkApplication parent_instance;
+ GDBusNodeInfo *introspection_data;
+ guint owner_id;
+ GSettings *listing_settings;
+ GSettings *ui_settings;
+};
-struct _FrApplicationPrivate {
- GDBusNodeInfo *introspection_data;
- guint owner_id;
- GSettings *listing_settings;
- GSettings *ui_settings;
-};
+G_DEFINE_TYPE (FrApplication, fr_application, GTK_TYPE_APPLICATION)
static void
@@ -358,12 +359,12 @@ fr_application_finalize (GObject *object)
{
FrApplication *self = FR_APPLICATION (object);
- if (self->priv->introspection_data != NULL)
- g_dbus_node_info_unref (self->priv->introspection_data);
- if (self->priv->owner_id != 0)
- g_bus_unown_name (self->priv->owner_id);
- _g_object_unref (self->priv->listing_settings);
- _g_object_unref (self->priv->ui_settings);
+ if (self->introspection_data != NULL)
+ g_dbus_node_info_unref (self->introspection_data);
+ if (self->owner_id != 0)
+ g_bus_unown_name (self->owner_id);
+ _g_object_unref (self->listing_settings);
+ _g_object_unref (self->ui_settings);
release_data ();
@@ -382,7 +383,7 @@ on_bus_acquired_for_archive_manager (GDBusConnection *connection,
registration_id = g_dbus_connection_register_object (connection,
"/org/gnome/ArchiveManager1",
- self->priv->introspection_data->interfaces[0],
+ self->introspection_data->interfaces[0],
&interface_vtable,
NULL,
NULL, /* user_data_free_func */
@@ -419,9 +420,9 @@ fr_application_register_archive_manager_service (FrApplication *self)
if (g_input_stream_read_all (stream, buffer, size, &bytes_read, NULL, NULL)) {
buffer[bytes_read] = '\0';
- self->priv->introspection_data = g_dbus_node_info_new_for_xml ((gchar *) buffer, &error);
- if (self->priv->introspection_data != NULL) {
- self->priv->owner_id = g_bus_own_name (G_BUS_TYPE_SESSION,
+ self->introspection_data = g_dbus_node_info_new_for_xml ((gchar *) buffer, &error);
+ if (self->introspection_data != NULL) {
+ self->owner_id = g_bus_own_name (G_BUS_TYPE_SESSION,
"org.gnome.ArchiveManager1",
G_BUS_NAME_OWNER_FLAGS_NONE,
on_bus_acquired_for_archive_manager,
@@ -708,8 +709,6 @@ fr_application_class_init (FrApplicationClass *klass)
GObjectClass *object_class;
GApplicationClass *application_class;
- g_type_class_add_private (klass, sizeof (FrApplicationPrivate));
-
object_class = G_OBJECT_CLASS (klass);
object_class->finalize = fr_application_finalize;
@@ -724,11 +723,10 @@ fr_application_class_init (FrApplicationClass *klass)
static void
fr_application_init (FrApplication *self)
{
- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, FR_TYPE_APPLICATION, FrApplicationPrivate);
- self->priv->owner_id = 0;
- self->priv->introspection_data = NULL;
- self->priv->listing_settings = g_settings_new (FILE_ROLLER_SCHEMA_LISTING);
- self->priv->ui_settings = g_settings_new (FILE_ROLLER_SCHEMA_UI);
+ self->owner_id = 0;
+ self->introspection_data = NULL;
+ self->listing_settings = g_settings_new (FILE_ROLLER_SCHEMA_LISTING);
+ self->ui_settings = g_settings_new (FILE_ROLLER_SCHEMA_UI);
}
@@ -747,9 +745,9 @@ fr_application_get_settings (FrApplication *app,
const char *schema)
{
if (strcmp (schema, FILE_ROLLER_SCHEMA_LISTING) == 0)
- return app->priv->listing_settings;
+ return app->listing_settings;
else if (strcmp (schema, FILE_ROLLER_SCHEMA_UI) == 0)
- return app->priv->ui_settings;
+ return app->ui_settings;
else
return NULL;
}
diff --git a/src/fr-application.h b/src/fr-application.h
index 1ac817ce..4e1f0d39 100644
--- a/src/fr-application.h
+++ b/src/fr-application.h
@@ -25,27 +25,8 @@
#include <gtk/gtk.h>
-#define FR_TYPE_APPLICATION (fr_application_get_type ())
-#define FR_APPLICATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), FR_TYPE_APPLICATION,
FrApplication))
-#define FR_APPLICATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), FR_TYPE_APPLICATION,
FrApplicationClass))
-#define FR_IS_APPLICATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), FR_TYPE_APPLICATION))
-#define FR_IS_APPLICATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), FR_TYPE_APPLICATION))
-#define FR_APPLICATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), FR_TYPE_APPLICATION,
FrApplicationClass))
+G_DECLARE_FINAL_TYPE (FrApplication, fr_application, FR, APPLICATION, GtkApplication)
-typedef struct _FrApplication FrApplication;
-typedef struct _FrApplicationClass FrApplicationClass;
-typedef struct _FrApplicationPrivate FrApplicationPrivate;
-
-struct _FrApplication {
- GtkApplication __parent;
- FrApplicationPrivate *priv;
-};
-
-struct _FrApplicationClass {
- GtkApplicationClass __parent_class;
-};
-
-GType fr_application_get_type (void);
GtkApplication * fr_application_new (void);
GSettings * fr_application_get_settings (FrApplication *app,
const char *schema);
diff --git a/src/fr-file-selector-dialog.c b/src/fr-file-selector-dialog.c
index eefa08a7..32a729ca 100644
--- a/src/fr-file-selector-dialog.c
+++ b/src/fr-file-selector-dialog.c
@@ -27,7 +27,7 @@
#include "gth-icon-cache.h"
-#define GET_WIDGET(x) (_gtk_builder_get_widget (self->priv->builder, (x)))
+#define GET_WIDGET(x) (_gtk_builder_get_widget (self->builder, (x)))
#define PREF_FILE_SELECTOR_WINDOW_SIZE "window-size"
#define PREF_FILE_SELECTOR_SHOW_HIDDEN "show-hidden"
#define PREF_FILE_SELECTOR_SIDEBAR_SIZE "sidebar-size"
@@ -36,9 +36,6 @@
#define SIDEBAR_CHARS 12
-G_DEFINE_TYPE (FrFileSelectorDialog, fr_file_selector_dialog, GTK_TYPE_DIALOG)
-
-
enum {
FILE_LIST_COLUMN_ICON,
FILE_LIST_COLUMN_NAME,
@@ -99,7 +96,8 @@ load_data_free (LoadData *load_data)
/* -- fr_file_selector_dialog -- */
-struct _FrFileSelectorDialogPrivate {
+struct _FrFileSelectorDialog {
+ GtkDialog parent_instance;
GtkBuilder *builder;
GtkWidget *extra_widget;
GFile *current_folder;
@@ -110,6 +108,9 @@ struct _FrFileSelectorDialogPrivate {
};
+G_DEFINE_TYPE (FrFileSelectorDialog, fr_file_selector_dialog, GTK_TYPE_DIALOG)
+
+
static void
fr_file_selector_dialog_finalize (GObject *object)
{
@@ -119,9 +120,9 @@ fr_file_selector_dialog_finalize (GObject *object)
g_signal_handlers_disconnect_by_data (g_volume_monitor_get (), self);
- g_object_unref (self->priv->builder);
- _g_object_unref (self->priv->current_folder);
- g_object_unref (self->priv->settings);
+ g_object_unref (self->builder);
+ _g_object_unref (self->current_folder);
+ g_object_unref (self->settings);
G_OBJECT_CLASS (fr_file_selector_dialog_parent_class)->finalize (object);
}
@@ -133,12 +134,12 @@ set_current_folder (FrFileSelectorDialog *self,
{
char *folder_name;
- if (folder != self->priv->current_folder) {
- _g_object_unref (self->priv->current_folder);
- self->priv->current_folder = g_object_ref (folder);
+ if (folder != self->current_folder) {
+ _g_object_unref (self->current_folder);
+ self->current_folder = g_object_ref (folder);
}
- if (self->priv->current_folder == NULL)
+ if (self->current_folder == NULL)
return;
folder_name = g_file_get_parse_name (folder);
@@ -205,7 +206,7 @@ fr_file_selector_dialog_get_default_size (FrFileSelectorDialog *self,
{
int width, height;
- g_settings_get (self->priv->settings, PREF_FILE_SELECTOR_WINDOW_SIZE, "(ii)", &width, &height);
+ g_settings_get (self->settings, PREF_FILE_SELECTOR_WINDOW_SIZE, "(ii)", &width, &height);
if ((width > 0) && (height > 0)) {
*default_width = width;
*default_height = height;
@@ -214,7 +215,7 @@ fr_file_selector_dialog_get_default_size (FrFileSelectorDialog *self,
find_good_window_size_from_style (GTK_WIDGET (self), default_width, default_height);
- if ((self->priv->extra_widget != NULL) && gtk_widget_get_visible (self->priv->extra_widget)) {
+ if ((self->extra_widget != NULL) && gtk_widget_get_visible (self->extra_widget)) {
GtkRequisition req;
gtk_widget_get_preferred_size (GET_WIDGET ("extra_widget_container"), &req, NULL);
@@ -245,14 +246,14 @@ fr_file_selector_dialog_realize (GtkWidget *widget)
self = FR_FILE_SELECTOR_DIALOG (widget);
- self->priv->icon_cache = gth_icon_cache_new_for_widget (GTK_WIDGET (self), GTK_ICON_SIZE_MENU);
+ self->icon_cache = gth_icon_cache_new_for_widget (GTK_WIDGET (self), GTK_ICON_SIZE_MENU);
icon = g_content_type_get_icon ("text/plain");
- gth_icon_cache_set_fallback (self->priv->icon_cache, icon);
+ gth_icon_cache_set_fallback (self->icon_cache, icon);
g_object_unref (icon);
_fr_file_selector_dialog_update_size (self);
- sidebar_size = g_settings_get_int (self->priv->settings, PREF_FILE_SELECTOR_SIDEBAR_SIZE);
+ sidebar_size = g_settings_get_int (self->settings, PREF_FILE_SELECTOR_SIDEBAR_SIZE);
if (sidebar_size <= 0)
sidebar_size = get_font_size (widget) * SIDEBAR_CHARS;
gtk_paned_set_position (GTK_PANED (GET_WIDGET ("main_paned")), sidebar_size);
@@ -266,8 +267,8 @@ fr_file_selector_dialog_unrealize (GtkWidget *widget)
self = FR_FILE_SELECTOR_DIALOG (widget);
- gth_icon_cache_free (self->priv->icon_cache);
- self->priv->icon_cache = NULL;
+ gth_icon_cache_free (self->icon_cache);
+ self->icon_cache = NULL;
GTK_WIDGET_CLASS (fr_file_selector_dialog_parent_class)->unrealize (widget);
}
@@ -283,14 +284,14 @@ fr_file_selector_dialog_unmap (GtkWidget *widget)
self = FR_FILE_SELECTOR_DIALOG (widget);
gtk_window_get_size (GTK_WINDOW (self), &width, &height);
- g_settings_set (self->priv->settings, PREF_FILE_SELECTOR_WINDOW_SIZE, "(ii)", width, height);
- g_settings_set_boolean (self->priv->settings, PREF_FILE_SELECTOR_SHOW_HIDDEN,
self->priv->show_hidden);
- g_settings_set_int (self->priv->settings,
+ g_settings_set (self->settings, PREF_FILE_SELECTOR_WINDOW_SIZE, "(ii)", width, height);
+ g_settings_set_boolean (self->settings, PREF_FILE_SELECTOR_SHOW_HIDDEN, self->show_hidden);
+ g_settings_set_int (self->settings,
PREF_FILE_SELECTOR_SIDEBAR_SIZE,
gtk_paned_get_position (GTK_PANED (GET_WIDGET ("main_paned"))));
- if (self->priv->current_operation != NULL)
- g_cancellable_cancel (self->priv->current_operation->cancellable);
+ if (self->current_operation != NULL)
+ g_cancellable_cancel (self->current_operation->cancellable);
GTK_WIDGET_CLASS (fr_file_selector_dialog_parent_class)->unmap (widget);
}
@@ -303,8 +304,6 @@ fr_file_selector_dialog_class_init (FrFileSelectorDialogClass *klass)
GObjectClass *object_class;
GtkWidgetClass *widget_class;
- g_type_class_add_private (klass, sizeof (FrFileSelectorDialogPrivate));
-
object_class = (GObjectClass*) klass;
object_class->finalize = fr_file_selector_dialog_finalize;
@@ -542,10 +541,10 @@ go_up_button_clicked_cb (GtkButton *button,
FrFileSelectorDialog *self = user_data;
GFile *parent;
- if (self->priv->current_folder == NULL)
+ if (self->current_folder == NULL)
return;
- parent = g_file_get_parent (self->priv->current_folder);
+ parent = g_file_get_parent (self->current_folder);
if (parent == NULL)
return;
@@ -640,7 +639,7 @@ show_hidden_files_menuitem_toggled_cb (GtkCheckMenuItem *checkmenuitem,
GFile *folder;
GList *selected_files;
- self->priv->show_hidden = gtk_check_menu_item_get_active (checkmenuitem);
+ self->show_hidden = gtk_check_menu_item_get_active (checkmenuitem);
folder = fr_file_selector_dialog_get_current_folder (self);
selected_files = fr_file_selector_dialog_get_selected_files (self);
_set_current_folder (self, folder, selected_files);
@@ -653,12 +652,11 @@ show_hidden_files_menuitem_toggled_cb (GtkCheckMenuItem *checkmenuitem,
static void
fr_file_selector_dialog_init (FrFileSelectorDialog *self)
{
- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, FR_TYPE_FILE_SELECTOR_DIALOG,
FrFileSelectorDialogPrivate);
- self->priv->current_folder = NULL;
- self->priv->builder = _gtk_builder_new_from_resource ("file-selector.ui");
- self->priv->icon_cache = NULL;
- self->priv->settings = g_settings_new ("org.gnome.FileRoller.FileSelector");
- self->priv->show_hidden = g_settings_get_boolean (self->priv->settings,
PREF_FILE_SELECTOR_SHOW_HIDDEN);
+ self->current_folder = NULL;
+ self->builder = _gtk_builder_new_from_resource ("file-selector.ui");
+ self->icon_cache = NULL;
+ self->settings = g_settings_new ("org.gnome.FileRoller.FileSelector");
+ self->show_hidden = g_settings_get_boolean (self->settings, PREF_FILE_SELECTOR_SHOW_HIDDEN);
gtk_container_set_border_width (GTK_CONTAINER (self), 5);
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (self))), GET_WIDGET
("content"), TRUE, TRUE, 0);
@@ -668,7 +666,7 @@ fr_file_selector_dialog_init (FrFileSelectorDialog *self)
gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (GET_WIDGET ("files_liststore")),
FILE_LIST_COLUMN_MODIFIED, files_modified_column_sort_func, self, NULL);
gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (GET_WIDGET ("files_liststore")),
FILE_LIST_COLUMN_NAME, GTK_SORT_ASCENDING);
- gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (GET_WIDGET ("show_hidden_files_menuitem")),
self->priv->show_hidden);
+ gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (GET_WIDGET ("show_hidden_files_menuitem")),
self->show_hidden);
g_signal_connect (GET_WIDGET ("is_selected_cellrenderertoggle"),
"toggled",
@@ -712,7 +710,7 @@ GtkWidget *
fr_file_selector_dialog_new (const char *title,
GtkWindow *parent)
{
- return (GtkWidget *) g_object_new (FR_TYPE_FILE_SELECTOR_DIALOG,
+ return (GtkWidget *) g_object_new (fr_file_selector_dialog_get_type (),
"title", title,
"transient-for", parent,
"use-header-bar", _gtk_settings_get_dialogs_use_header (),
@@ -724,18 +722,18 @@ void
fr_file_selector_dialog_set_extra_widget (FrFileSelectorDialog *self,
GtkWidget *extra_widget)
{
- if (self->priv->extra_widget != NULL)
- gtk_container_remove (GTK_CONTAINER (GET_WIDGET ("extra_widget_container")),
self->priv->extra_widget);
- self->priv->extra_widget = extra_widget;
- if (self->priv->extra_widget != NULL)
- gtk_container_add (GTK_CONTAINER (GET_WIDGET ("extra_widget_container")),
self->priv->extra_widget);
+ if (self->extra_widget != NULL)
+ gtk_container_remove (GTK_CONTAINER (GET_WIDGET ("extra_widget_container")),
self->extra_widget);
+ self->extra_widget = extra_widget;
+ if (self->extra_widget != NULL)
+ gtk_container_add (GTK_CONTAINER (GET_WIDGET ("extra_widget_container")), self->extra_widget);
}
GtkWidget *
fr_file_selector_dialog_get_extra_widget (FrFileSelectorDialog *self)
{
- return self->priv->extra_widget;
+ return self->extra_widget;
}
@@ -772,8 +770,8 @@ folder_mount_enclosing_volume_ready_cb (GObject *source_object,
if (! g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
_gtk_error_dialog_run (GTK_WINDOW (self), _("Could not load the location"), "%s",
error->message);
- if (load_data->dialog->priv->current_operation == load_data)
- load_data->dialog->priv->current_operation = NULL;
+ if (load_data->dialog->current_operation == load_data)
+ load_data->dialog->current_operation = NULL;
load_data_free (load_data);
return;
@@ -817,8 +815,8 @@ get_folder_content_done_cb (GError *error,
if (! g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
_gtk_error_dialog_run (GTK_WINDOW (self), _("Could not load the location"), "%s",
error->message);
- if (load_data->dialog->priv->current_operation == load_data)
- load_data->dialog->priv->current_operation = NULL;
+ if (load_data->dialog->current_operation == load_data)
+ load_data->dialog->current_operation = NULL;
load_data_free (load_data);
return;
@@ -847,12 +845,12 @@ get_folder_content_done_cb (GError *error,
char *collate_key;
gboolean is_folder;
- if (! self->priv->show_hidden && g_file_info_get_is_hidden (file_info->info))
+ if (! self->show_hidden && g_file_info_get_is_hidden (file_info->info))
continue;
gtk_list_store_append (list_store, &iter);
- icon_pixbuf = gth_icon_cache_get_pixbuf (self->priv->icon_cache, g_file_info_get_icon
(file_info->info));
+ icon_pixbuf = gth_icon_cache_get_pixbuf (self->icon_cache, g_file_info_get_icon
(file_info->info));
size = g_format_size (g_file_info_get_size (file_info->info));
g_file_info_get_modification_time (file_info->info, &timeval);
datetime = g_date_time_new_from_timeval_local (&timeval);
@@ -884,8 +882,8 @@ get_folder_content_done_cb (GError *error,
set_current_folder (self, load_data->folder);
_update_sensitivity (self);
- if (load_data->dialog->priv->current_operation == load_data)
- load_data->dialog->priv->current_operation = NULL;
+ if (load_data->dialog->current_operation == load_data)
+ load_data->dialog->current_operation = NULL;
g_hash_table_unref (selected_files);
g_date_time_unref (today);
@@ -933,15 +931,15 @@ _set_current_folder (FrFileSelectorDialog *self,
GFile *folder,
GList *files)
{
- if (self->priv->current_operation != NULL)
- g_cancellable_cancel (self->priv->current_operation->cancellable);
+ if (self->current_operation != NULL)
+ g_cancellable_cancel (self->current_operation->cancellable);
gtk_list_store_clear (GTK_LIST_STORE (GET_WIDGET ("files_liststore")));
_update_sensitivity (self);
- self->priv->current_operation = load_data_new (self, folder);
- self->priv->current_operation->files_to_select = _g_object_list_ref (files);
- _get_folder_list (self->priv->current_operation);
+ self->current_operation = load_data_new (self, folder);
+ self->current_operation->files_to_select = _g_object_list_ref (files);
+ _get_folder_list (self->current_operation);
}
@@ -958,7 +956,7 @@ fr_file_selector_dialog_set_current_folder (FrFileSelectorDialog *self,
GFile *
fr_file_selector_dialog_get_current_folder (FrFileSelectorDialog *self)
{
- return _g_object_ref (self->priv->current_folder);
+ return _g_object_ref (self->current_folder);
}
diff --git a/src/fr-file-selector-dialog.h b/src/fr-file-selector-dialog.h
index 9695b38f..14eaf0bd 100644
--- a/src/fr-file-selector-dialog.h
+++ b/src/fr-file-selector-dialog.h
@@ -24,27 +24,8 @@
#include <gtk/gtk.h>
-#define FR_TYPE_FILE_SELECTOR_DIALOG (fr_file_selector_dialog_get_type ())
-#define FR_FILE_SELECTOR_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),
FR_TYPE_FILE_SELECTOR_DIALOG, FrFileSelectorDialog))
-#define FR_FILE_SELECTOR_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass),
FR_TYPE_FILE_SELECTOR_DIALOG, FrFileSelectorDialogClass))
-#define FR_IS_FILE_SELECTOR_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj),
FR_TYPE_FILE_SELECTOR_DIALOG))
-#define FR_IS_FILE_SELECTOR_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),
FR_TYPE_FILE_SELECTOR_DIALOG))
-#define FR_FILE_SELECTOR_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj),
FR_TYPE_FILE_SELECTOR_DIALOG, FrFileSelectorDialogClass))
+G_DECLARE_FINAL_TYPE (FrFileSelectorDialog, fr_file_selector_dialog, FR, FILE_SELECTOR_DIALOG, GtkDialog)
-typedef struct _FrFileSelectorDialog FrFileSelectorDialog;
-typedef struct _FrFileSelectorDialogClass FrFileSelectorDialogClass;
-typedef struct _FrFileSelectorDialogPrivate FrFileSelectorDialogPrivate;
-
-struct _FrFileSelectorDialog {
- GtkDialog parent_instance;
- FrFileSelectorDialogPrivate *priv;
-};
-
-struct _FrFileSelectorDialogClass {
- GtkDialogClass parent_class;
-};
-
-GType fr_file_selector_dialog_get_type (void);
GtkWidget * fr_file_selector_dialog_new (const char *title,
GtkWindow *parent);
void fr_file_selector_dialog_set_extra_widget (FrFileSelectorDialog *dialog,
diff --git a/src/fr-list-model.c b/src/fr-list-model.c
index d81b9045..e520f55f 100644
--- a/src/fr-list-model.c
+++ b/src/fr-list-model.c
@@ -28,6 +28,11 @@
static void fr_list_model_multi_drag_source_init (EggTreeMultiDragSourceInterface *iface);
+struct _FrListModel {
+ GtkListStore parent_instance;
+};
+
+
G_DEFINE_TYPE_WITH_CODE (FrListModel,
fr_list_model,
GTK_TYPE_LIST_STORE,
@@ -144,7 +149,7 @@ fr_list_model_new (int n_columns, ...)
g_return_val_if_fail (n_columns > 0, NULL);
- retval = g_object_new (FR_TYPE_LIST_MODEL, NULL);
+ retval = g_object_new (fr_list_model_get_type (), NULL);
va_start (args, n_columns);
types = g_new0 (GType, n_columns);
diff --git a/src/fr-list-model.h b/src/fr-list-model.h
index b57cef48..22872d03 100644
--- a/src/fr-list-model.h
+++ b/src/fr-list-model.h
@@ -24,22 +24,8 @@
#include <gtk/gtk.h>
-#define FR_TYPE_LIST_MODEL (fr_list_model_get_type ())
-#define FR_LIST_MODEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), FR_TYPE_LIST_MODEL, FrListModel))
-#define FR_LIST_MODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), FR_TYPE_LIST_MODEL,
FrListModelClass))
-#define FR_IS_LIST_MODEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), FR_TYPE_LIST_MODEL))
-#define FR_IS_LIST_MODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), FR_TYPE_LIST_MODEL))
-#define FR_LIST_MODEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), FR_TYPE_LIST_MODEL,
FrListModelClass))
+G_DECLARE_FINAL_TYPE (FrListModel, fr_list_model, FR, LIST_MODEL, GtkListStore)
-typedef struct FrListModel {
- GtkListStore __parent;
-} FrListModel;
-
-typedef struct FrListModelClass {
- GtkListStoreClass __parent_class;
-} FrListModelClass;
-
-GType fr_list_model_get_type (void);
GtkListStore *fr_list_model_new (int n_columns, ...);
#endif /* FR_LIST_MODEL_H */
diff --git a/src/fr-location-bar.c b/src/fr-location-bar.c
index 83e26fdf..a85100f3 100644
--- a/src/fr-location-bar.c
+++ b/src/fr-location-bar.c
@@ -23,8 +23,8 @@
#include "fr-location-bar.h"
-struct _FrLocationBarPrivate {
- int dummy;
+struct _FrLocationBar {
+ GtkBox parent_instance;
};
@@ -64,8 +64,6 @@ fr_location_bar_class_init (FrLocationBarClass *klass)
{
GtkWidgetClass *widget_class;
- g_type_class_add_private (klass, sizeof (FrLocationBarPrivate));
-
widget_class = GTK_WIDGET_CLASS (klass);
widget_class->draw = fr_location_bar_draw;
}
@@ -83,9 +81,6 @@ fr_location_bar_init (FrLocationBar *self)
GtkStyleContext *style_context;
GtkCssProvider *css_provider;
- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, FR_TYPE_LOCATION_BAR, FrLocationBarPrivate);
- self->priv->dummy = 0;
-
gtk_orientable_set_orientation (GTK_ORIENTABLE (self), GTK_ORIENTATION_HORIZONTAL);
gtk_box_set_spacing (GTK_BOX (self), 6);
@@ -105,5 +100,5 @@ fr_location_bar_init (FrLocationBar *self)
GtkWidget *
fr_location_bar_new (void)
{
- return (GtkWidget *) g_object_new (FR_TYPE_LOCATION_BAR, NULL);
+ return (GtkWidget *) g_object_new (fr_location_bar_get_type (), NULL);
}
diff --git a/src/fr-location-bar.h b/src/fr-location-bar.h
index 09c3f3ae..8172b66c 100644
--- a/src/fr-location-bar.h
+++ b/src/fr-location-bar.h
@@ -24,27 +24,8 @@
#include <gtk/gtk.h>
-#define FR_TYPE_LOCATION_BAR (fr_location_bar_get_type ())
-#define FR_LOCATION_BAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), FR_TYPE_LOCATION_BAR,
FrLocationBar))
-#define FR_LOCATION_BAR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), FR_TYPE_LOCATION_BAR,
FrLocationBarClass))
-#define FR_IS_LOCATION_BAR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), FR_TYPE_LOCATION_BAR))
-#define FR_IS_LOCATION_BAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), FR_TYPE_LOCATION_BAR))
-#define FR_LOCATION_BAR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), FR_TYPE_LOCATION_BAR,
FrLocationBarClass))
+G_DECLARE_FINAL_TYPE (FrLocationBar, fr_location_bar, FR, LOCATION_BAR, GtkBox)
-typedef struct _FrLocationBar FrLocationBar;
-typedef struct _FrLocationBarClass FrLocationBarClass;
-typedef struct _FrLocationBarPrivate FrLocationBarPrivate;
-
-struct _FrLocationBar {
- GtkBox parent_instance;
- FrLocationBarPrivate *priv;
-};
-
-struct _FrLocationBarClass {
- GtkBoxClass parent_class;
-};
-
-GType fr_location_bar_get_type (void);
GtkWidget * fr_location_bar_new (void);
#endif /* FR_LOCATION_BAR_H */
diff --git a/src/fr-new-archive-dialog.c b/src/fr-new-archive-dialog.c
index c29059a7..11918163 100644
--- a/src/fr-new-archive-dialog.c
+++ b/src/fr-new-archive-dialog.c
@@ -32,12 +32,13 @@
#include "preferences.h"
-#define GET_WIDGET(x) (_gtk_builder_get_widget (self->priv->builder, (x)))
+#define GET_WIDGET(x) (_gtk_builder_get_widget (self->builder, (x)))
#define MEGABYTE (1024 * 1024)
#define ARCHIVE_ICON_SIZE 48
-struct _FrNewArchiveDialogPrivate {
+struct _FrNewArchiveDialog {
+ GtkDialog parent_instance;
GSettings *settings;
GtkBuilder *builder;
int *supported_types;
@@ -60,11 +61,11 @@ fr_new_archive_dialog_finalize (GObject *object)
self = FR_NEW_ARCHIVE_DIALOG (object);
- _g_object_list_unref (self->priv->files_to_add);
- _g_object_unref (self->priv->original_file);
- g_object_unref (self->priv->settings);
- g_object_unref (self->priv->builder);
- g_hash_table_unref (self->priv->supported_ext);
+ _g_object_list_unref (self->files_to_add);
+ _g_object_unref (self->original_file);
+ g_object_unref (self->settings);
+ g_object_unref (self->builder);
+ g_hash_table_unref (self->supported_ext);
G_OBJECT_CLASS (fr_new_archive_dialog_parent_class)->finalize (object);
}
@@ -73,7 +74,7 @@ fr_new_archive_dialog_finalize (GObject *object)
static int
get_selected_format (FrNewArchiveDialog *self)
{
- return self->priv->supported_types[gtk_combo_box_get_active (GTK_COMBO_BOX (GET_WIDGET
("extension_comboboxtext")))];
+ return self->supported_types[gtk_combo_box_get_active (GTK_COMBO_BOX (GET_WIDGET
("extension_comboboxtext")))];
}
@@ -85,11 +86,11 @@ fr_new_archive_dialog_unmap (GtkWidget *widget)
self = FR_NEW_ARCHIVE_DIALOG (widget);
- g_settings_set_boolean (self->priv->settings, PREF_NEW_ENCRYPT_HEADER, gtk_toggle_button_get_active
(GTK_TOGGLE_BUTTON (GET_WIDGET ("encrypt_header_checkbutton"))));
- g_settings_set_int (self->priv->settings, PREF_NEW_VOLUME_SIZE, gtk_spin_button_get_value
(GTK_SPIN_BUTTON (GET_WIDGET ("volume_spinbutton"))) * MEGABYTE);
+ g_settings_set_boolean (self->settings, PREF_NEW_ENCRYPT_HEADER, gtk_toggle_button_get_active
(GTK_TOGGLE_BUTTON (GET_WIDGET ("encrypt_header_checkbutton"))));
+ g_settings_set_int (self->settings, PREF_NEW_VOLUME_SIZE, gtk_spin_button_get_value (GTK_SPIN_BUTTON
(GET_WIDGET ("volume_spinbutton"))) * MEGABYTE);
n_format = get_selected_format (self);
- g_settings_set_string (self->priv->settings, PREF_NEW_DEFAULT_EXTENSION,
mime_type_desc[n_format].default_ext);
+ g_settings_set_string (self->settings, PREF_NEW_DEFAULT_EXTENSION,
mime_type_desc[n_format].default_ext);
GTK_WIDGET_CLASS (fr_new_archive_dialog_parent_class)->unmap (widget);
}
@@ -101,8 +102,6 @@ fr_new_archive_dialog_class_init (FrNewArchiveDialogClass *klass)
GObjectClass *object_class;
GtkWidgetClass *widget_class;
- g_type_class_add_private (klass, sizeof (FrNewArchiveDialogPrivate));
-
object_class = G_OBJECT_CLASS (klass);
object_class->finalize = fr_new_archive_dialog_finalize;
@@ -114,12 +113,11 @@ fr_new_archive_dialog_class_init (FrNewArchiveDialogClass *klass)
static void
fr_new_archive_dialog_init (FrNewArchiveDialog *self)
{
- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, FR_TYPE_NEW_ARCHIVE_DIALOG,
FrNewArchiveDialogPrivate);
- self->priv->settings = g_settings_new (FILE_ROLLER_SCHEMA_NEW);
- self->priv->builder = NULL;
- self->priv->supported_ext = g_hash_table_new (g_str_hash, g_str_equal);
- self->priv->original_file = NULL;
- self->priv->files_to_add = NULL;
+ self->settings = g_settings_new (FILE_ROLLER_SCHEMA_NEW);
+ self->builder = NULL;
+ self->supported_ext = g_hash_table_new (g_str_hash, g_str_equal);
+ self->original_file = NULL;
+ self->files_to_add = NULL;
}
@@ -127,9 +125,9 @@ static void
_fr_new_archive_dialog_update_sensitivity (FrNewArchiveDialog *self)
{
gtk_widget_set_sensitive (gtk_dialog_get_widget_for_response (GTK_DIALOG (self), GTK_RESPONSE_OK), !
_g_utf8_all_spaces (gtk_entry_get_text (GTK_ENTRY (GET_WIDGET ("filename_entry")))));
- gtk_toggle_button_set_inconsistent (GTK_TOGGLE_BUTTON (GET_WIDGET ("encrypt_header_checkbutton")), !
self->priv->can_encrypt_header);
- gtk_widget_set_sensitive (GET_WIDGET ("encrypt_header_checkbutton"), self->priv->can_encrypt_header);
- gtk_widget_set_sensitive (GET_WIDGET ("volume_spinbutton"), ! self->priv->can_create_volumes ||
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("volume_checkbutton"))));
+ gtk_toggle_button_set_inconsistent (GTK_TOGGLE_BUTTON (GET_WIDGET ("encrypt_header_checkbutton")), !
self->can_encrypt_header);
+ gtk_widget_set_sensitive (GET_WIDGET ("encrypt_header_checkbutton"), self->can_encrypt_header);
+ gtk_widget_set_sensitive (GET_WIDGET ("volume_spinbutton"), ! self->can_create_volumes ||
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("volume_checkbutton"))));
}
@@ -158,15 +156,15 @@ extension_comboboxtext_changed_cb (GtkComboBox *combo_box,
n_format = get_selected_format (self);
- self->priv->can_encrypt = mime_type_desc[n_format].capabilities & FR_ARCHIVE_CAN_ENCRYPT;
- gtk_widget_set_sensitive (GET_WIDGET ("password_entry"), self->priv->can_encrypt);
- gtk_widget_set_sensitive (GET_WIDGET ("password_label"), self->priv->can_encrypt);
+ self->can_encrypt = mime_type_desc[n_format].capabilities & FR_ARCHIVE_CAN_ENCRYPT;
+ gtk_widget_set_sensitive (GET_WIDGET ("password_entry"), self->can_encrypt);
+ gtk_widget_set_sensitive (GET_WIDGET ("password_label"), self->can_encrypt);
- self->priv->can_encrypt_header = mime_type_desc[n_format].capabilities &
FR_ARCHIVE_CAN_ENCRYPT_HEADER;
- gtk_widget_set_sensitive (GET_WIDGET ("encrypt_header_checkbutton"), self->priv->can_encrypt_header);
+ self->can_encrypt_header = mime_type_desc[n_format].capabilities & FR_ARCHIVE_CAN_ENCRYPT_HEADER;
+ gtk_widget_set_sensitive (GET_WIDGET ("encrypt_header_checkbutton"), self->can_encrypt_header);
- self->priv->can_create_volumes = mime_type_desc[n_format].capabilities &
FR_ARCHIVE_CAN_CREATE_VOLUMES;
- gtk_widget_set_sensitive (GET_WIDGET ("volume_box"), self->priv->can_create_volumes);
+ self->can_create_volumes = mime_type_desc[n_format].capabilities & FR_ARCHIVE_CAN_CREATE_VOLUMES;
+ gtk_widget_set_sensitive (GET_WIDGET ("volume_box"), self->can_create_volumes);
_fr_new_archive_dialog_update_sensitivity (self);
}
@@ -207,33 +205,33 @@ _fr_new_archive_dialog_construct (FrNewArchiveDialog *self,
gtk_window_set_resizable (GTK_WINDOW (self), FALSE);
gtk_container_set_border_width (GTK_CONTAINER (self), 5);
- self->priv->builder = _gtk_builder_new_from_resource ("new-archive-dialog.ui");
- if (self->priv->builder == NULL)
+ self->builder = _gtk_builder_new_from_resource ("new-archive-dialog.ui");
+ if (self->builder == NULL)
return;
- _g_object_unref (self->priv->original_file);
- self->priv->original_file = _g_object_ref (original_file);
+ _g_object_unref (self->original_file);
+ self->original_file = _g_object_ref (original_file);
gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (self))), GET_WIDGET
("content"));
gtk_dialog_add_button (GTK_DIALOG (self), _GTK_LABEL_CANCEL, GTK_RESPONSE_CANCEL);
switch (action) {
case FR_NEW_ARCHIVE_ACTION_NEW_MANY_FILES:
- self->priv->supported_types = create_type;
+ self->supported_types = create_type;
gtk_dialog_add_button (GTK_DIALOG (self), _GTK_LABEL_CREATE_ARCHIVE, GTK_RESPONSE_OK);
break;
case FR_NEW_ARCHIVE_ACTION_NEW_SINGLE_FILE:
- self->priv->supported_types = single_file_save_type;
+ self->supported_types = single_file_save_type;
gtk_dialog_add_button (GTK_DIALOG (self), _GTK_LABEL_CREATE_ARCHIVE, GTK_RESPONSE_OK);
break;
case FR_NEW_ARCHIVE_ACTION_SAVE_AS:
- self->priv->supported_types = save_type;
+ self->supported_types = save_type;
gtk_dialog_add_button (GTK_DIALOG (self), _GTK_LABEL_SAVE, GTK_RESPONSE_OK);
break;
}
gtk_dialog_set_default_response (GTK_DIALOG (self), GTK_RESPONSE_OK);
- sort_mime_types_by_extension (self->priv->supported_types);
+ sort_mime_types_by_extension (self->supported_types);
/* Set widgets data. */
@@ -255,18 +253,18 @@ _fr_new_archive_dialog_construct (FrNewArchiveDialog *self,
gtk_expander_set_expanded (GTK_EXPANDER (GET_WIDGET ("other_options_expander")), FALSE);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("encrypt_header_checkbutton")),
- g_settings_get_boolean (self->priv->settings, PREF_NEW_ENCRYPT_HEADER));
+ g_settings_get_boolean (self->settings, PREF_NEW_ENCRYPT_HEADER));
gtk_spin_button_set_value (GTK_SPIN_BUTTON (GET_WIDGET ("volume_spinbutton")),
- (double) g_settings_get_int (self->priv->settings, PREF_NEW_VOLUME_SIZE) /
MEGABYTE);
+ (double) g_settings_get_int (self->settings, PREF_NEW_VOLUME_SIZE) /
MEGABYTE);
- active_extension = g_settings_get_string (self->priv->settings, PREF_NEW_DEFAULT_EXTENSION);
+ active_extension = g_settings_get_string (self->settings, PREF_NEW_DEFAULT_EXTENSION);
active_extension_idx = 0;
- for (i = 0; self->priv->supported_types[i] != -1; i++) {
- if (strcmp (active_extension, mime_type_desc[self->priv->supported_types[i]].default_ext) ==
0)
+ for (i = 0; self->supported_types[i] != -1; i++) {
+ if (strcmp (active_extension, mime_type_desc[self->supported_types[i]].default_ext) == 0)
active_extension_idx = i;
gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (GET_WIDGET ("extension_comboboxtext")),
- mime_type_desc[self->priv->supported_types[i]].default_ext);
+ mime_type_desc[self->supported_types[i]].default_ext);
}
gtk_combo_box_set_active (GTK_COMBO_BOX (GET_WIDGET ("extension_comboboxtext")),
active_extension_idx);
g_free (active_extension);
@@ -309,7 +307,7 @@ fr_new_archive_dialog_new (const char *title,
{
FrNewArchiveDialog *self;
- self = g_object_new (FR_TYPE_NEW_ARCHIVE_DIALOG,
+ self = g_object_new (fr_new_archive_dialog_get_type (),
"title", title,
"use-header-bar", _gtk_settings_get_dialogs_use_header (),
NULL);
@@ -323,8 +321,8 @@ void
fr_new_archive_dialog_set_files_to_add (FrNewArchiveDialog *self,
GList *file_list /* GFile list */)
{
- _g_object_list_unref (self->priv->files_to_add);
- self->priv->files_to_add = _g_object_list_ref (file_list);
+ _g_object_list_unref (self->files_to_add);
+ self->files_to_add = _g_object_list_ref (file_list);
}
@@ -449,7 +447,7 @@ fr_new_archive_dialog_get_file (FrNewArchiveDialog *self,
/* check whehter the file is equal to the original file */
- if ((self->priv->original_file != NULL) && (g_file_equal (file, self->priv->original_file))) {
+ if ((self->original_file != NULL) && (g_file_equal (file, self->original_file))) {
dialog = _gtk_error_dialog_new (GTK_WINDOW (self),
GTK_DIALOG_MODAL,
NULL,
@@ -470,7 +468,7 @@ fr_new_archive_dialog_get_file (FrNewArchiveDialog *self,
{
GList *scan;
- for (scan = self->priv->files_to_add; scan; scan = scan->next) {
+ for (scan = self->files_to_add; scan; scan = scan->next) {
if (_g_file_cmp_uris (G_FILE (scan->data), file) == 0) {
dialog = _gtk_error_dialog_new (GTK_WINDOW (self),
GTK_DIALOG_MODAL,
diff --git a/src/fr-new-archive-dialog.h b/src/fr-new-archive-dialog.h
index 0e4840f6..56031083 100644
--- a/src/fr-new-archive-dialog.h
+++ b/src/fr-new-archive-dialog.h
@@ -30,27 +30,8 @@ typedef enum {
FR_NEW_ARCHIVE_ACTION_SAVE_AS
} FrNewArchiveAction;
-#define FR_TYPE_NEW_ARCHIVE_DIALOG (fr_new_archive_dialog_get_type ())
-#define FR_NEW_ARCHIVE_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),
FR_TYPE_NEW_ARCHIVE_DIALOG, FrNewArchiveDialog))
-#define FR_NEW_ARCHIVE_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), FR_TYPE_NEW_ARCHIVE_DIALOG,
FrNewArchiveDialogClass))
-#define FR_IS_NEW_ARCHIVE_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj),
FR_TYPE_NEW_ARCHIVE_DIALOG))
-#define FR_IS_NEW_ARCHIVE_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), FR_TYPE_NEW_ARCHIVE_DIALOG))
-#define FR_NEW_ARCHIVE_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), FR_TYPE_NEW_ARCHIVE_DIALOG,
FrNewArchiveDialogClass))
+G_DECLARE_FINAL_TYPE (FrNewArchiveDialog, fr_new_archive_dialog, FR, NEW_ARCHIVE_DIALOG, GtkDialog)
-typedef struct _FrNewArchiveDialog FrNewArchiveDialog;
-typedef struct _FrNewArchiveDialogClass FrNewArchiveDialogClass;
-typedef struct _FrNewArchiveDialogPrivate FrNewArchiveDialogPrivate;
-
-struct _FrNewArchiveDialog {
- GtkDialog parent_instance;
- FrNewArchiveDialogPrivate *priv;
-};
-
-struct _FrNewArchiveDialogClass {
- GtkDialogClass parent_class;
-};
-
-GType fr_new_archive_dialog_get_type (void);
GtkWidget * fr_new_archive_dialog_new (const char *title,
GtkWindow *parent,
FrNewArchiveAction action,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
