From 54d13ca20e7965d4b3e56db8fb1331c2187588a5 Mon Sep 17 00:00:00 2001 From: monsta Date: Fri, 5 Jan 2018 13:39:30 +0300 Subject: about-me: drop unused code --- capplets/about-me/Makefile.am | 3 - capplets/about-me/eel-alert-dialog.c | 478 ----------------------------- capplets/about-me/eel-alert-dialog.h | 61 ---- capplets/about-me/eel-gtk-macros.h | 178 ----------- capplets/about-me/mate-about-me-password.c | 1 - 5 files changed, 721 deletions(-) delete mode 100644 capplets/about-me/eel-alert-dialog.c delete mode 100644 capplets/about-me/eel-alert-dialog.h delete mode 100644 capplets/about-me/eel-gtk-macros.h (limited to 'capplets') diff --git a/capplets/about-me/Makefile.am b/capplets/about-me/Makefile.am index 126dcdd4..f510c81f 100644 --- a/capplets/about-me/Makefile.am +++ b/capplets/about-me/Makefile.am @@ -7,9 +7,6 @@ ui_files = mate-about-me-dialog.ui mate-about-me-password.ui mate-about-me-finge Desktop_in_files = mate-about-me.desktop.in mate_about_me_SOURCES = \ - eel-alert-dialog.c \ - eel-alert-dialog.h \ - eel-gtk-macros.h \ mate-about-me-password.c \ mate-about-me-password.h \ e-image-chooser.c \ diff --git a/capplets/about-me/eel-alert-dialog.c b/capplets/about-me/eel-alert-dialog.c deleted file mode 100644 index 37854657..00000000 --- a/capplets/about-me/eel-alert-dialog.c +++ /dev/null @@ -1,478 +0,0 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ - -/* eel-alert-dialog.c: An HIG compliant alert dialog. - - The Mate Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The Mate Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the Mate Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, - Boston, MA 02110-1301, USA. - -*/ - -#include "eel-alert-dialog.h" -#include "eel-gtk-macros.h" - -#include -#include - -#include - -enum { - PROP_0, - PROP_ALERT_TYPE, - PROP_BUTTONS -}; - -struct _EelAlertDialogDetails { - GtkWidget *image; - GtkWidget *primary_label; - GtkWidget *secondary_label; - GtkWidget *details_expander; - GtkWidget *details_label; - GtkMessageType type; -}; - - -static gpointer parent_class; - -static void eel_alert_dialog_finalize (GObject *object); -static void eel_alert_dialog_class_init (EelAlertDialogClass *klass); -static void eel_alert_dialog_init (EelAlertDialog *dialog); -static void eel_alert_dialog_style_set (GtkWidget *widget, - GtkStyle *prev_style); -static void eel_alert_dialog_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec); -static void eel_alert_dialog_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec); -static void eel_alert_dialog_add_buttons (EelAlertDialog *alert_dialog, - GtkButtonsType buttons); - -GType -eel_alert_dialog_get_type (void) -{ - static GType dialog_type = 0; - - if (!dialog_type) { - - static const GTypeInfo dialog_info = - { - sizeof (EelAlertDialogClass), - NULL, - NULL, - (GClassInitFunc) eel_alert_dialog_class_init, - NULL, - NULL, - sizeof (EelAlertDialog), - 0, - (GInstanceInitFunc) eel_alert_dialog_init, - }; - - dialog_type = g_type_register_static (GTK_TYPE_DIALOG, "EelAlertDialog", - &dialog_info, 0); - } - return dialog_type; -} - -static void -eel_alert_dialog_class_init (EelAlertDialogClass *class) -{ - GtkWidgetClass *widget_class; - GObjectClass *gobject_class; - - widget_class = GTK_WIDGET_CLASS (class); - gobject_class = G_OBJECT_CLASS (class); - - parent_class = g_type_class_peek_parent (class); - - G_OBJECT_CLASS (class)->finalize = eel_alert_dialog_finalize; - - widget_class->style_set = eel_alert_dialog_style_set; - - gobject_class->set_property = eel_alert_dialog_set_property; - gobject_class->get_property = eel_alert_dialog_get_property; - - gtk_widget_class_install_style_property (widget_class, - g_param_spec_int ("alert_border", - _("Image/label border"), - _("Width of border around the label and image in the alert dialog"), - 0, - G_MAXINT, - 5, - G_PARAM_READABLE)); - - g_object_class_install_property (gobject_class, - PROP_ALERT_TYPE, - g_param_spec_enum ("alert_type", - _("Alert Type"), - _("The type of alert"), - GTK_TYPE_MESSAGE_TYPE, - GTK_MESSAGE_INFO, - G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); - - g_object_class_install_property (gobject_class, - PROP_BUTTONS, - g_param_spec_enum ("buttons", - _("Alert Buttons"), - _("The buttons shown in the alert dialog"), - GTK_TYPE_BUTTONS_TYPE, - GTK_BUTTONS_NONE, - G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); -} - -static void -eel_alert_dialog_finalize (GObject *object) -{ - EelAlertDialog *dialog; - - dialog = EEL_ALERT_DIALOG (object); - - g_free (dialog->details); - - EEL_CALL_PARENT (G_OBJECT_CLASS, finalize, (object)); -} - - -static void -eel_alert_dialog_init (EelAlertDialog *dialog) -{ - GtkWidget *hbox; - GtkWidget *vbox; - GtkWidget *expander; - - dialog->details = g_new0 (EelAlertDialogDetails, 1); - - dialog->details->primary_label = gtk_label_new (NULL); - dialog->details->secondary_label = gtk_label_new (NULL); - dialog->details->details_label = gtk_label_new (NULL); -// dialog->details->image = gtk_image_new_from_stock (NULL, GTK_ICON_SIZE_DIALOG); - dialog->details->image = gtk_image_new_from_icon_name (NULL, GTK_ICON_SIZE_DIALOG); - gtk_widget_set_halign (dialog->details->image, GTK_ALIGN_CENTER); - gtk_widget_set_valign (dialog->details->image, GTK_ALIGN_START); - - gtk_label_set_line_wrap (GTK_LABEL (dialog->details->primary_label), TRUE); - gtk_label_set_selectable (GTK_LABEL (dialog->details->primary_label), TRUE); - gtk_label_set_use_markup (GTK_LABEL (dialog->details->primary_label), TRUE); -#if GTK_CHECK_VERSION (3, 16, 0) - gtk_label_set_xalign (GTK_LABEL (dialog->details->primary_label), 0.0); -#else - gtk_misc_set_alignment (GTK_MISC (dialog->details->primary_label), 0.0, 0.5); -#endif - - gtk_label_set_line_wrap (GTK_LABEL (dialog->details->secondary_label), TRUE); - gtk_label_set_selectable (GTK_LABEL (dialog->details->secondary_label), TRUE); -#if GTK_CHECK_VERSION (3, 16, 0) - gtk_label_set_xalign (GTK_LABEL (dialog->details->secondary_label), 0.0); -#else - gtk_misc_set_alignment (GTK_MISC (dialog->details->secondary_label), 0.0, 0.5); -#endif - - gtk_label_set_line_wrap (GTK_LABEL (dialog->details->details_label), TRUE); - gtk_label_set_selectable (GTK_LABEL (dialog->details->details_label), TRUE); -#if GTK_CHECK_VERSION (3, 16, 0) - gtk_label_set_xalign (GTK_LABEL (dialog->details->details_label), 0.0); -#else - gtk_misc_set_alignment (GTK_MISC (dialog->details->details_label), 0.0, 0.5); -#endif - - hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12); - gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); - - gtk_box_pack_start (GTK_BOX (hbox), dialog->details->image, - FALSE, FALSE, 0); - - vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12); - - gtk_box_pack_start (GTK_BOX (hbox), vbox, - FALSE, FALSE, 0); - - gtk_box_pack_start (GTK_BOX (vbox), dialog->details->primary_label, - FALSE, FALSE, 0); - - gtk_box_pack_start (GTK_BOX (vbox), dialog->details->secondary_label, - FALSE, FALSE, 0); - - expander = gtk_expander_new_with_mnemonic (_("Show more _details")); - dialog->details->details_expander = expander; - gtk_expander_set_spacing (GTK_EXPANDER (expander), 6); - gtk_container_add (GTK_CONTAINER (expander), dialog->details->details_label); - - gtk_box_pack_start (GTK_BOX (vbox), expander, - FALSE, FALSE, 0); - - - gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), hbox, - FALSE, FALSE, 0); - - gtk_widget_show_all (hbox); - gtk_widget_hide (expander); - -} - -static void -setup_type (EelAlertDialog *dialog, - GtkMessageType type) -{ - const gchar *icon_name = NULL; - - switch (type) { - case GTK_MESSAGE_INFO: - icon_name = "dialog-information"; - break; - case GTK_MESSAGE_QUESTION: - icon_name = "dialog-question"; - break; - case GTK_MESSAGE_WARNING: - icon_name = "dialog-warning"; - break; - case GTK_MESSAGE_ERROR: - icon_name = "dialog-error"; - break; - default: - g_warning ("Unknown GtkMessageType %d", type); - break; - } - - if (icon_name == NULL) { - icon_name = "dialog-information"; - } - - if (icon_name) { - gtk_image_set_from_icon_name (GTK_IMAGE (dialog->details->image), icon_name, - GTK_ICON_SIZE_DIALOG); - } else { - g_warning ("Dialog icon-name doesn't exist?"); - } -} - -static void -eel_alert_dialog_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) -{ - EelAlertDialog *dialog; - - dialog = EEL_ALERT_DIALOG (object); - - switch (prop_id) { - case PROP_ALERT_TYPE: - dialog->details->type = g_value_get_enum (value); - setup_type (dialog, dialog->details->type); - break; - case PROP_BUTTONS: - eel_alert_dialog_add_buttons (dialog, g_value_get_enum (value)); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -eel_alert_dialog_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) -{ - EelAlertDialog *dialog; - - dialog = EEL_ALERT_DIALOG (object); - - switch (prop_id) { - case PROP_ALERT_TYPE: - g_value_set_enum (value, dialog->details->type); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -void -eel_alert_dialog_set_primary_label (EelAlertDialog *dialog, - const gchar *message) -{ - gchar *markup_str; - char *escaped_message; - - if (message != NULL) { - escaped_message = g_markup_escape_text (message, -1); - markup_str = g_strconcat ("", escaped_message, "", NULL); - gtk_label_set_markup (GTK_LABEL (EEL_ALERT_DIALOG (dialog)->details->primary_label), - markup_str); - g_free (markup_str); - g_free (escaped_message); - } -} - -void -eel_alert_dialog_set_secondary_label (EelAlertDialog *dialog, - const gchar *message) -{ - if (message != NULL) { - gtk_label_set_text (GTK_LABEL (EEL_ALERT_DIALOG (dialog)->details->secondary_label), - message); - } else { - gtk_widget_hide (EEL_ALERT_DIALOG (dialog)->details->secondary_label); - } -} - -void -eel_alert_dialog_set_details_label (EelAlertDialog *dialog, - const gchar *message) -{ - if (message != NULL) { - gtk_widget_show (dialog->details->details_expander); - gtk_label_set_text (GTK_LABEL (dialog->details->details_label), message); - } else { - gtk_widget_hide (dialog->details->details_expander); - } -} - - -GtkWidget* -eel_alert_dialog_new (GtkWindow *parent, - GtkDialogFlags flags, - GtkMessageType type, - GtkButtonsType buttons, - const gchar *primary_message, - const gchar *secondary_message, - const gchar *title) -{ - GtkWidget *widget; - GtkDialog *dialog; - - g_return_val_if_fail (parent == NULL || GTK_IS_WINDOW (parent), NULL); - - widget = g_object_new (EEL_TYPE_ALERT_DIALOG, - "alert_type", type, - "buttons", buttons, - NULL); - atk_object_set_role (gtk_widget_get_accessible (widget), ATK_ROLE_ALERT); - - dialog = GTK_DIALOG (widget); - - gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); - gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), 14); - gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE); - - gtk_window_set_title (GTK_WINDOW (dialog), - (title != NULL) ? title : ""); - - eel_alert_dialog_set_primary_label (EEL_ALERT_DIALOG (dialog), - primary_message); - - eel_alert_dialog_set_secondary_label (EEL_ALERT_DIALOG (dialog), - secondary_message); - - if (parent != NULL) { - gtk_window_set_transient_for (GTK_WINDOW (widget), - GTK_WINDOW (parent)); - } - - if (flags & GTK_DIALOG_MODAL) { - gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); - } - - if (flags & GTK_DIALOG_DESTROY_WITH_PARENT) { - gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE); - } - return widget; -} - -static void -eel_alert_dialog_add_buttons (EelAlertDialog* alert_dialog, - GtkButtonsType buttons) -{ - GtkDialog* dialog; - - dialog = GTK_DIALOG (alert_dialog); - - switch (buttons) { - case GTK_BUTTONS_NONE: - break; - case GTK_BUTTONS_OK: - gtk_dialog_add_button (dialog, - GTK_STOCK_OK, - GTK_RESPONSE_OK); - gtk_dialog_set_default_response (dialog, - GTK_RESPONSE_OK); - break; - case GTK_BUTTONS_CLOSE: - gtk_dialog_add_button (dialog, - GTK_STOCK_CLOSE, - GTK_RESPONSE_CLOSE); - gtk_dialog_set_default_response (dialog, - GTK_RESPONSE_CLOSE); - break; - case GTK_BUTTONS_CANCEL: - gtk_dialog_add_button (dialog, - GTK_STOCK_CANCEL, - GTK_RESPONSE_CANCEL); - gtk_dialog_set_default_response (dialog, - GTK_RESPONSE_CANCEL); - break; - case GTK_BUTTONS_YES_NO: - gtk_dialog_add_button (dialog, - GTK_STOCK_NO, - GTK_RESPONSE_NO); - gtk_dialog_add_button (dialog, - GTK_STOCK_YES, - GTK_RESPONSE_YES); - gtk_dialog_set_default_response (dialog, - GTK_RESPONSE_YES); - break; - case GTK_BUTTONS_OK_CANCEL: - gtk_dialog_add_button (dialog, - GTK_STOCK_CANCEL, - GTK_RESPONSE_CANCEL); - gtk_dialog_add_button (dialog, - GTK_STOCK_OK, - GTK_RESPONSE_OK); - gtk_dialog_set_default_response (dialog, - GTK_RESPONSE_OK); - break; - default: - g_warning ("Unknown GtkButtonsType"); - break; - } - g_object_notify (G_OBJECT (alert_dialog), "buttons"); -} - -static void -eel_alert_dialog_style_set (GtkWidget *widget, - GtkStyle *prev_style) -{ - GtkWidget *parent; - gint border_width; - - border_width = 0; - - parent = gtk_widget_get_parent (EEL_ALERT_DIALOG (widget)->details->image); - - if (parent != NULL) { - gtk_widget_style_get (widget, "alert_border", - &border_width, NULL); - - gtk_container_set_border_width (GTK_CONTAINER (parent), - border_width); - } - - if (GTK_WIDGET_CLASS (parent_class)->style_set) { - (GTK_WIDGET_CLASS (parent_class)->style_set) (widget, prev_style); - } -} diff --git a/capplets/about-me/eel-alert-dialog.h b/capplets/about-me/eel-alert-dialog.h deleted file mode 100644 index cb87244b..00000000 --- a/capplets/about-me/eel-alert-dialog.h +++ /dev/null @@ -1,61 +0,0 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ - -/* eel-alert-dialog.h: An HIG compliant alert dialog. - - The Mate Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The Mate Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the Mate Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, - Boston, MA 02110-1301, USA. - -*/ - -#ifndef EEL_ALERT_DIALOG_H -#define EEL_ALERT_DIALOG_H - -#include - -#define EEL_TYPE_ALERT_DIALOG (eel_alert_dialog_get_type ()) -#define EEL_ALERT_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEL_TYPE_ALERT_DIALOG, EelAlertDialog)) - -typedef struct _EelAlertDialog EelAlertDialog; -typedef struct _EelAlertDialogClass EelAlertDialogClass; -typedef struct _EelAlertDialogDetails EelAlertDialogDetails; - -struct _EelAlertDialog -{ - GtkDialog parent_instance; - EelAlertDialogDetails *details; -}; - -struct _EelAlertDialogClass -{ - GtkDialogClass parent_class; -}; - -GType eel_alert_dialog_get_type (void); - -GtkWidget* eel_alert_dialog_new (GtkWindow *parent, - GtkDialogFlags flags, - GtkMessageType type, - GtkButtonsType buttons, - const gchar *primary_message, - const gchar *secondary_message, - const gchar *title); -void eel_alert_dialog_set_primary_label (EelAlertDialog *dialog, - const gchar *message); -void eel_alert_dialog_set_secondary_label (EelAlertDialog *dialog, - const gchar *message); -void eel_alert_dialog_set_details_label (EelAlertDialog *dialog, - const gchar *message); - -#endif /* EEL_ALERT_DIALOG_H */ diff --git a/capplets/about-me/eel-gtk-macros.h b/capplets/about-me/eel-gtk-macros.h deleted file mode 100644 index 50e44e59..00000000 --- a/capplets/about-me/eel-gtk-macros.h +++ /dev/null @@ -1,178 +0,0 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- - - eel-gtk-macros.h: Macros to reduce boilerplate when using GTK. - - Copyright (C) 1999, 2000, 2001 Eazel, Inc. - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this program; if not, write to the - Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, - Boston, MA 02110-1301, USA. - - Authors: Darin Adler - Ramiro Estrugo -*/ - -#ifndef EEL_GTK_MACROS_H -#define EEL_GTK_MACROS_H - -#ifndef EEL_DISABLE_DEPRECATED - -/* Define a parent_class global and a get_type function for a GTK class. - Since this is boilerplate, it's better not to repeat it over and over again. - Called like this: - - EEL_CLASS_BOILERPLATE (EelBookmark, eel_bookmark, GTK_TYPE_OBJECT) - - The parent_class_type parameter is guaranteed to be evaluated only once - so it can be an expression, even an expression that contains a function call. -*/ - -#define EEL_CLASS_BOILERPLATE(class_name, prefix, parent_class_type) \ - EEL_BOILERPLATE (class_name, class_name, prefix, parent_class_type, \ - EEL_REGISTER_TYPE) -#define EEL_REGISTER_TYPE(class_name, corba_name) \ - g_type_register_static (parent_type, #class_name, &info, 0) - -#define EEL_BOILERPLATE(class_name, corba_name, prefix, parent_class_type, \ - register_type) \ - \ -static gpointer parent_class; \ - \ -GType \ -prefix##_get_type (void) \ -{ \ - GType parent_type; \ - static GType type; \ - \ - if (type == 0) { \ - static GTypeInfo info = { \ - sizeof (class_name##Class), \ - NULL, NULL, \ - (GClassInitFunc) prefix##_class_init, \ - NULL, NULL, \ - sizeof (class_name), 0, \ - (GInstanceInitFunc) prefix##_init, \ - NULL \ - }; \ - \ - parent_type = (parent_class_type); \ - type = register_type (class_name, corba_name); \ - parent_class = g_type_class_ref (parent_type); \ - } \ - \ - return type; \ -} - -/* Call a parent class version of a virtual function (or default - * signal handler since that's the same thing). Nice because it - * documents what it's doing and there is less chance for a - * typo. Depends on the parent class pointer having the conventional - * name "parent_class" as the boilerplate macro above does it. - */ -#define EEL_CALL_PARENT(parent_class_cast_macro, signal, parameters) \ - \ -G_STMT_START { \ - if (parent_class_cast_macro (parent_class)->signal != NULL) { \ - (* parent_class_cast_macro (parent_class)->signal) parameters;\ - } \ -} G_STMT_END - -/* Same thing, for functions with a return value. */ -#define EEL_CALL_PARENT_WITH_RETURN_VALUE(parent_class_cast_macro, signal, \ - parameters) \ - \ -(parent_class_cast_macro (parent_class)->signal == NULL) \ - ? 0 \ - : ((* parent_class_cast_macro (parent_class)->signal) parameters) - -#endif /* EEL_DISABLE_DEPRECATED */ - -/* Call a virtual function. Useful when the virtual function is not a - * signal, otherwise you want to gtk_signal emit. Nice because it - * documents what it's doing and there is less chance for a typo. - */ -#define EEL_CALL_METHOD(class_cast_macro, object, signal, parameters) \ - \ -G_STMT_START { \ - if (class_cast_macro (G_OBJECT_GET_CLASS (object))->signal != NULL) { \ - (* class_cast_macro (G_OBJECT_GET_CLASS (object))->signal) \ - parameters; \ - } \ -} G_STMT_END - -/* Same thing, for functions with a return value. */ -#define EEL_CALL_METHOD_WITH_RETURN_VALUE(class_cast_macro, object, signal, \ - parameters) \ - \ -(class_cast_macro (G_OBJECT_GET_CLASS (object))->signal == NULL) \ - ? 0 \ - : ((* class_cast_macro (G_OBJECT_GET_CLASS (object))->signal) \ - parameters) \ - -#ifndef G_DISABLE_ASSERT - -/* Define a signal that is not implemented by this class but must be - * implemented by subclasses. This macro should be used inside the - * class initialization function. The companion macro EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL - * must be used earlier in the file. Called like this: - * - * EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, - * fm_directory_view, - * clear); - */ -#define EEL_ASSIGN_MUST_OVERRIDE_SIGNAL(class_pointer, prefix, signal) \ - \ -* (void (**)(void)) & (class_pointer)->signal = prefix##_unimplemented_##signal - -/* Provide a debug-only implementation of a signal that must be implemented - * by subclasses. The debug-only implementation fires a warning if it is called. - * This macro should be placed as if it were a function, earlier in the file - * than the class initialization function. Called like this: - * - * EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, clear); - */ -#define EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL(prefix, signal) \ - \ -static void \ -prefix##_unimplemented_##signal (void) \ -{ \ - g_warning ("failed to override signal " #prefix "->" #signal); \ -} - -#else /* G_DISABLE_ASSERT */ - -#define EEL_DEFINE_MUST_OVERRIDE_SIGNAL(class_cast_macro, class_pointer, prefix, signal) -#define EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL(prefix, signal) -#define EEL_ASSIGN_MUST_OVERRIDE_SIGNAL(class_pointer, prefix, signal) - -#endif /* G_DISABLE_ASSERT */ - -/* Access a method. */ -#define EEL_ACCESS_METHOD(class_cast_macro, object, method) \ -(class_cast_macro (G_OBJECT_GET_CLASS (object))->method) - -/* Invoke a method for a given object. */ -#define EEL_INVOKE_METHOD(class_cast_macro, object, method, parameters) \ -((* EEL_ACCESS_METHOD (class_cast_macro, object, method)) parameters) - -/* Assert the non-nullness of a method for a given object. */ -#define EEL_ASSERT_METHOD(class_cast_macro, object, method) \ -g_assert (EEL_ACCESS_METHOD (class_cast_macro, object, method) != NULL) - -/* Invoke a method if it ain't null. */ -#define EEL_INVOKE_METHOD_IF(class_cast_macro, object, method, parameters) \ -(EEL_ACCESS_METHOD (class_cast_macro, object, method) ? 0 : \ - EEL_INVOKE_METHOD (class_cast_macro, object, method, parameters)) - -#endif /* EEL_GTK_MACROS_H */ diff --git a/capplets/about-me/mate-about-me-password.c b/capplets/about-me/mate-about-me-password.c index 6de5218f..abac117d 100644 --- a/capplets/about-me/mate-about-me-password.c +++ b/capplets/about-me/mate-about-me-password.c @@ -42,7 +42,6 @@ #endif #include "capplet-util.h" -#include "eel-alert-dialog.h" /* Passwd states */ typedef enum { -- cgit v1.2.1