From 4c517ce646a64c528b7340d7d57a09c0242f1c8f Mon Sep 17 00:00:00 2001 From: Diego Escalante Urrelo Date: Sun, 19 Sep 2010 18:08:00 -0500 Subject: Don't use deprecated gtk_dialog_set_has_separator This is deprecated in GTK+ 2.22 Bug #630107 --- libempathy-gtk/empathy-contact-dialogs.c | 4 ---- libempathy-gtk/empathy-contact-selector-dialog.c | 2 -- libempathy-gtk/empathy-individual-dialogs.c | 1 - libempathy-gtk/empathy-individual-edit-dialog.c | 1 - libempathy-gtk/empathy-individual-information-dialog.c | 1 - libempathy-gtk/empathy-linking-dialog.c | 1 - libempathy-gtk/empathy-status-preset-dialog.c | 1 - libempathy-gtk/empathy-ui-utils.h | 16 ---------------- src/empathy-accounts-dialog.c | 5 ----- src/empathy-import-dialog.c | 5 ----- src/empathy-preferences.c | 5 ----- 11 files changed, 42 deletions(-) diff --git a/libempathy-gtk/empathy-contact-dialogs.c b/libempathy-gtk/empathy-contact-dialogs.c index 6da181087..9189d41e6 100644 --- a/libempathy-gtk/empathy-contact-dialogs.c +++ b/libempathy-gtk/empathy-contact-dialogs.c @@ -178,7 +178,6 @@ empathy_contact_information_dialog_show (EmpathyContact *contact, /* Create dialog */ dialog = gtk_dialog_new (); - empathy_dialog_remove_separator (GTK_DIALOG (dialog)); gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE); gtk_window_set_title (GTK_WINDOW (dialog), empathy_contact_get_alias (contact)); @@ -238,7 +237,6 @@ empathy_contact_edit_dialog_show (EmpathyContact *contact, /* Create dialog */ dialog = gtk_dialog_new (); - empathy_dialog_remove_separator (GTK_DIALOG (dialog)); gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE); gtk_window_set_title (GTK_WINDOW (dialog), _("Edit Contact Information")); @@ -290,7 +288,6 @@ empathy_contact_personal_dialog_show (GtkWindow *parent) /* Create dialog */ personal_dialog = gtk_dialog_new (); - empathy_dialog_remove_separator (GTK_DIALOG (personal_dialog)); gtk_window_set_resizable (GTK_WINDOW (personal_dialog), FALSE); gtk_window_set_title (GTK_WINDOW (personal_dialog), _("Personal Information")); @@ -396,7 +393,6 @@ empathy_new_contact_dialog_show_with_contact (GtkWindow *parent, /* Create dialog */ dialog = gtk_dialog_new (); - empathy_dialog_remove_separator (GTK_DIALOG (dialog)); gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE); gtk_window_set_title (GTK_WINDOW (dialog), _("New Contact")); diff --git a/libempathy-gtk/empathy-contact-selector-dialog.c b/libempathy-gtk/empathy-contact-selector-dialog.c index 7989e9ccc..62b902746 100644 --- a/libempathy-gtk/empathy-contact-selector-dialog.c +++ b/libempathy-gtk/empathy-contact-selector-dialog.c @@ -316,8 +316,6 @@ empathy_contact_selector_dialog_init (EmpathyContactSelectorDialog *dialog) GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); /* Tweak the dialog */ - empathy_dialog_remove_separator (GTK_DIALOG (dialog)); - gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE); gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER_ON_PARENT); gtk_window_set_type_hint (GTK_WINDOW (dialog), GDK_WINDOW_TYPE_HINT_DIALOG); diff --git a/libempathy-gtk/empathy-individual-dialogs.c b/libempathy-gtk/empathy-individual-dialogs.c index 55682812e..edfb3fd48 100644 --- a/libempathy-gtk/empathy-individual-dialogs.c +++ b/libempathy-gtk/empathy-individual-dialogs.c @@ -107,7 +107,6 @@ empathy_new_individual_dialog_show_with_individual (GtkWindow *parent, /* Create dialog */ dialog = gtk_dialog_new (); - empathy_dialog_remove_separator (GTK_DIALOG (dialog)); gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE); gtk_window_set_title (GTK_WINDOW (dialog), _("New Contact")); diff --git a/libempathy-gtk/empathy-individual-edit-dialog.c b/libempathy-gtk/empathy-individual-edit-dialog.c index 30ca1cc66..b49e29f8b 100644 --- a/libempathy-gtk/empathy-individual-edit-dialog.c +++ b/libempathy-gtk/empathy-individual-edit-dialog.c @@ -243,7 +243,6 @@ empathy_individual_edit_dialog_init ( dialog->priv = priv; priv->individual = NULL; - empathy_dialog_remove_separator (GTK_DIALOG (dialog)); gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE); gtk_window_set_title (GTK_WINDOW (dialog), _("Edit Contact Information")); diff --git a/libempathy-gtk/empathy-individual-information-dialog.c b/libempathy-gtk/empathy-individual-information-dialog.c index e6d4a90ad..bb52e7d85 100644 --- a/libempathy-gtk/empathy-individual-information-dialog.c +++ b/libempathy-gtk/empathy-individual-information-dialog.c @@ -273,7 +273,6 @@ empathy_individual_information_dialog_init ( dialog->priv = priv; priv->individual = NULL; - empathy_dialog_remove_separator (GTK_DIALOG (dialog)); gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE); content_area = GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))); diff --git a/libempathy-gtk/empathy-linking-dialog.c b/libempathy-gtk/empathy-linking-dialog.c index 2e62e5d1e..d0a091053 100644 --- a/libempathy-gtk/empathy-linking-dialog.c +++ b/libempathy-gtk/empathy-linking-dialog.c @@ -108,7 +108,6 @@ empathy_linking_dialog_init (EmpathyLinkingDialog *self) dialog = GTK_DIALOG (self); /* Set up dialog */ - empathy_dialog_remove_separator (GTK_DIALOG (dialog)); gtk_window_set_resizable (GTK_WINDOW (self), TRUE); /* Translators: this is the title of the linking dialogue (reached by * right-clicking on a contact and selecting "Link…"). "Link" in this title diff --git a/libempathy-gtk/empathy-status-preset-dialog.c b/libempathy-gtk/empathy-status-preset-dialog.c index 2a5904bfb..2d7ecfe6e 100644 --- a/libempathy-gtk/empathy-status-preset-dialog.c +++ b/libempathy-gtk/empathy-status-preset-dialog.c @@ -521,7 +521,6 @@ empathy_status_preset_dialog_init (EmpathyStatusPresetDialog *self) gtk_window_set_title (GTK_WINDOW (self), _("Edit Custom Messages")); - empathy_dialog_remove_separator (GTK_DIALOG (self)); gtk_dialog_add_button (GTK_DIALOG (self), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE); diff --git a/libempathy-gtk/empathy-ui-utils.h b/libempathy-gtk/empathy-ui-utils.h index 43da188db..0b76d09a3 100644 --- a/libempathy-gtk/empathy-ui-utils.h +++ b/libempathy-gtk/empathy-ui-utils.h @@ -129,22 +129,6 @@ void empathy_window_iconify (GtkWindow *windo GtkStatusIcon *status_icon); GtkWindow * empathy_get_toplevel_window (GtkWidget *widget); -/** - * empathy_dialog_remove_separator: - * @d: a #GtkDialog - * - * Replacement for gtk_dialog_set_has_separator(), which was removed for GTK+ 3. - * This is a no-op for GTK+ 3, and expands to a call to - * gtk_dialog_set_has_separator() with %FALSE for GTK+ 2. - * - * FIXME: Once we depend on GTK+ 3 unconditionally, this macro can be removed. - */ -#ifndef HAVE_GTK3 -#define empathy_dialog_remove_separator(d) gtk_dialog_set_has_separator(d, FALSE); -#else -#define empathy_dialog_remove_separator(d) -#endif - /* URL */ gchar * empathy_make_absolute_url (const gchar *url); diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c index 98301a485..35bea08ea 100644 --- a/src/empathy-accounts-dialog.c +++ b/src/empathy-accounts-dialog.c @@ -2161,11 +2161,6 @@ accounts_dialog_build_ui (EmpathyAccountsDialog *dialog) gtk_window_set_type_hint (GTK_WINDOW (dialog), GDK_WINDOW_TYPE_HINT_DIALOG); - /* FIXME: Remove this once we unconditionally depend on GTK+ 3 */ -#ifndef HAVE_GTK3 - gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); -#endif - /* add dialog buttons */ gtk_button_box_set_layout (GTK_BUTTON_BOX (action_area), GTK_BUTTONBOX_END); diff --git a/src/empathy-import-dialog.c b/src/empathy-import-dialog.c index 1fc00c0e5..da0c9d3ea 100644 --- a/src/empathy-import-dialog.c +++ b/src/empathy-import-dialog.c @@ -198,11 +198,6 @@ empathy_import_dialog_init (EmpathyImportDialog *self) gtk_container_set_border_width (GTK_CONTAINER (self), 5); gtk_window_set_title (GTK_WINDOW (self), _("Import Accounts")); gtk_window_set_modal (GTK_WINDOW (self), TRUE); - - /* FIXME: Remove this once we unconditionally depend on GTK+ 3 */ -#ifndef HAVE_GTK3 - gtk_dialog_set_has_separator (GTK_DIALOG (self), FALSE); -#endif } static void diff --git a/src/empathy-preferences.c b/src/empathy-preferences.c index edc405974..89133edb5 100644 --- a/src/empathy-preferences.c +++ b/src/empathy-preferences.c @@ -885,11 +885,6 @@ empathy_preferences_init (EmpathyPreferences *preferences) GTK_WIN_POS_CENTER_ON_PARENT); gtk_window_set_icon_name (GTK_WINDOW (preferences), "gtk-preferences"); - /* FIXME: Remove this once we unconditionally depend on GTK+ 3 */ -#ifndef HAVE_GTK3 - gtk_dialog_set_has_separator (GTK_DIALOG (preferences), FALSE); -#endif - filename = empathy_file_lookup ("empathy-preferences.ui", "src"); gui = empathy_builder_get_file (filename, "notebook", &priv->notebook, -- cgit v1.2.3