PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED_GTK3)
PKG_CHECK_MODULES(UNIQUE, unique-3.0 >= $UNIQUE_REQUIRED)
PKG_CHECK_MODULES(GCR, gcr-3 >= $KEYRING_REQUIRED)
+
+ AC_DEFINE(HAVE_GTK3, 1, [Define if we're compiling against GTK+ 3])
else
PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED)
/* Create dialog */
dialog = gtk_dialog_new ();
- gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
+ 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));
/* Create dialog */
dialog = gtk_dialog_new ();
- gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
+ 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"));
/* Create dialog */
personal_dialog = gtk_dialog_new ();
- gtk_dialog_set_has_separator (GTK_DIALOG (personal_dialog), FALSE);
+ 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"));
/* Create dialog */
dialog = gtk_dialog_new ();
- gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
+ empathy_dialog_remove_separator (GTK_DIALOG (dialog));
gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
gtk_window_set_title (GTK_WINDOW (dialog), _("New Contact"));
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
/* Tweak the dialog */
- gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
+ 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);
/* Create dialog */
dialog = gtk_dialog_new ();
- gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
+ empathy_dialog_remove_separator (GTK_DIALOG (dialog));
gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
gtk_window_set_title (GTK_WINDOW (dialog), _("New Contact"));
dialog->priv = priv;
priv->individual = NULL;
- gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
+ 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"));
dialog->priv = priv;
priv->individual = NULL;
- gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
+ 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)));
#include "empathy-linking-dialog.h"
#include "empathy-individual-linker.h"
+#include "empathy-ui-utils.h"
/**
* SECTION:empathy-individual-widget
dialog = GTK_DIALOG (self);
/* Set up dialog */
- gtk_dialog_set_has_separator (dialog, FALSE);
+ 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
gtk_window_set_title (GTK_WINDOW (self),
_("Edit Custom Messages"));
- gtk_dialog_set_has_separator (GTK_DIALOG (self), FALSE);
+ empathy_dialog_remove_separator (GTK_DIALOG (self));
gtk_dialog_add_button (GTK_DIALOG (self),
GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
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);
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);
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
gtk_window_set_position (GTK_WINDOW (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,