GNOME.org
 

[almanah] Bug #641481 - Cannot build with gtk3/evolution 2.91.6

commit df3ab3c2b9ebf8b18558cdd33388b0b1b16d678f
Author: Milan Crha <mcrha redhat com>
Date:   Mon Feb 7 12:18:55 2011 +0100

    Bug #641481 - Cannot build with gtk3/evolution 2.91.6

 configure.ac                      |    4 ++--
 src/add-definition-dialog.c       |    3 +--
 src/date-entry-dialog.c           |    3 +--
 src/events/calendar-appointment.c |    2 +-
 src/events/calendar-task.c        |    2 +-
 src/import-export-dialog.c        |    2 --
 src/main.c                        |   27 ++++++++++++++++++++++++++-
 src/main.h                        |    1 +
 src/preferences-dialog.c          |   14 +++++++++-----
 src/search-dialog.c               |    3 +--
 10 files changed, 43 insertions(+), 18 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index af2add6..14b727a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -78,12 +78,12 @@ dnl Dependencies
 dnl ***************************************************************************
 
 dnl Required dependencies
-PKG_CHECK_MODULES(STANDARD, glib-2.0 gtk+-2.0 >= 2.14 gmodule-2.0 gthread-2.0 gio-2.0 sqlite3 cairo gconf-2.0 atk)
+PKG_CHECK_MODULES(STANDARD, glib-2.0 gtk+-3.0 >= 2.14 gmodule-2.0 gthread-2.0 gio-2.0 sqlite3 cairo gconf-2.0 atk)
 AC_SUBST(STANDARD_CFLAGS)
 AC_SUBST(STANDARD_LIBS)
 
 dnl Evolution
-PKG_CHECK_MODULES(EVO, libecal-1.2 libedataserver-1.2 libedataserverui-1.2, have_evo=yes, have_evo=no)
+PKG_CHECK_MODULES(EVO, libecal-1.2 libedataserver-1.2 libedataserverui-3.0, have_evo=yes, have_evo=no)
 if test "x$have_evo" = "xyes"; then
 	AC_DEFINE(HAVE_EVO, 1, [Defined if libecal-1.2 is installed])
 fi
diff --git a/src/add-definition-dialog.c b/src/add-definition-dialog.c
index fe5c746..9f25550 100644
--- a/src/add-definition-dialog.c
+++ b/src/add-definition-dialog.c
@@ -77,7 +77,6 @@ almanah_add_definition_dialog_init (AlmanahAddDefinitionDialog *self)
 	self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, ALMANAH_TYPE_ADD_DEFINITION_DIALOG, AlmanahAddDefinitionDialogPrivate);
 
 	g_signal_connect (self, "response", G_CALLBACK (response_cb), self);
-	gtk_dialog_set_has_separator (GTK_DIALOG (self), FALSE);
 	gtk_window_set_resizable (GTK_WINDOW (self), FALSE);
 	gtk_window_set_title (GTK_WINDOW (self), _("Add Definition"));
 	gtk_window_set_transient_for (GTK_WINDOW (self), GTK_WINDOW (almanah->main_window));
@@ -212,7 +211,7 @@ response_cb (GtkDialog *dialog, gint response_id, AlmanahAddDefinitionDialog *se
 	almanah_definition_close_dialog (priv->definition, priv->vbox);
 
 	/* Make sure to remove all the custom widgets for the currently-selected definition type */
-	gtk_widget_hide_all (GTK_WIDGET (dialog));
+	gtk_widget_hide (GTK_WIDGET (dialog));
 	destroy_extra_widgets (self);
 }
 
diff --git a/src/date-entry-dialog.c b/src/date-entry-dialog.c
index 4e02130..aa2c539 100644
--- a/src/date-entry-dialog.c
+++ b/src/date-entry-dialog.c
@@ -68,8 +68,7 @@ almanah_date_entry_dialog_init (AlmanahDateEntryDialog *self)
 	self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, ALMANAH_TYPE_DATE_ENTRY_DIALOG, AlmanahDateEntryDialogPrivate);
 
 	g_date_clear (&(self->priv->date), 1);
-	g_signal_connect (self, "response", G_CALLBACK (gtk_widget_hide_all), self);
-	gtk_dialog_set_has_separator (GTK_DIALOG (self), FALSE);
+	g_signal_connect (self, "response", G_CALLBACK (gtk_widget_hide), self);
 	gtk_window_set_resizable (GTK_WINDOW (self), FALSE);
 	gtk_window_set_title (GTK_WINDOW (self), _("Select Date"));
 	gtk_window_set_transient_for (GTK_WINDOW (self), GTK_WINDOW (almanah->main_window));
diff --git a/src/events/calendar-appointment.c b/src/events/calendar-appointment.c
index 742f2f9..a5e7e70 100644
--- a/src/events/calendar-appointment.c
+++ b/src/events/calendar-appointment.c
@@ -111,7 +111,7 @@ almanah_calendar_appointment_event_view (AlmanahEvent *event)
 	if (almanah->debug == TRUE)
 		g_debug ("Executing \"%s\".", command_line);
 
-	retval = gdk_spawn_command_line_on_screen (gtk_widget_get_screen (almanah->main_window), command_line, &error);
+	retval = almanah_run_on_screen (gtk_widget_get_screen (almanah->main_window), command_line, &error);
 	g_free (command_line);
 
 	if (retval == FALSE) {
diff --git a/src/events/calendar-task.c b/src/events/calendar-task.c
index b88f719..39c17e3 100644
--- a/src/events/calendar-task.c
+++ b/src/events/calendar-task.c
@@ -100,7 +100,7 @@ almanah_calendar_task_event_view (AlmanahEvent *event)
 	if (almanah->debug == TRUE)
 		g_debug ("Executing \"%s\".", command_line);
 
-	retval = gdk_spawn_command_line_on_screen (gtk_widget_get_screen (almanah->main_window), command_line, &error);
+	retval = almanah_run_on_screen (gtk_widget_get_screen (almanah->main_window), command_line, &error);
 	g_free (command_line);
 
 	if (retval == FALSE) {
diff --git a/src/import-export-dialog.c b/src/import-export-dialog.c
index c7e25b3..c317741 100644
--- a/src/import-export-dialog.c
+++ b/src/import-export-dialog.c
@@ -69,7 +69,6 @@ almanah_import_export_dialog_init (AlmanahImportExportDialog *self)
 	self->priv->current_mode = -1; /* no mode selected */
 
 	g_signal_connect (self, "response", G_CALLBACK (response_cb), self);
-	gtk_dialog_set_has_separator (GTK_DIALOG (self), FALSE);
 	gtk_window_set_default_size (GTK_WINDOW (self), 500, 400);
 }
 
@@ -384,7 +383,6 @@ almanah_import_results_dialog_init (AlmanahImportResultsDialog *self)
 
 	g_signal_connect (self, "response", G_CALLBACK (response_cb), self);
 	g_signal_connect (self, "delete-event", G_CALLBACK (gtk_widget_hide_on_delete), self);
-	gtk_dialog_set_has_separator (GTK_DIALOG (self), FALSE);
 	gtk_window_set_resizable (GTK_WINDOW (self), TRUE);
 	gtk_window_set_title (GTK_WINDOW (self), _("Import Results"));
 	gtk_window_set_default_size (GTK_WINDOW (self), 600, 400);
diff --git a/src/main.c b/src/main.c
index 6b9b45f..64b3826 100644
--- a/src/main.c
+++ b/src/main.c
@@ -61,6 +61,32 @@ storage_manager_disconnected_cb (AlmanahStorageManager *self, const gchar *gpgme
 	exit (0);
 }
 
+gboolean
+almanah_run_on_screen (GdkScreen *screen, const gchar *commandline, GError **error)
+{
+	gboolean retval;
+	GAppInfo *appinfo;
+	GdkAppLaunchContext *context;
+
+	appinfo = g_app_info_create_from_commandline (commandline,
+                                                "Almanah Execute",
+                                                G_APP_INFO_CREATE_NONE,
+                                                error);
+
+	if (!appinfo)
+		return FALSE;
+
+	context = gdk_display_get_app_launch_context (gdk_screen_get_display (screen));
+	gdk_app_launch_context_set_screen (context, screen);
+
+	retval = g_app_info_launch (appinfo, NULL, G_APP_LAUNCH_CONTEXT (context), error);
+
+	g_object_unref (context);
+	g_object_unref (appinfo);
+
+	return retval;
+}
+
 void
 almanah_quit (void)
 {
@@ -107,7 +133,6 @@ main (int argc, char *argv[])
 #endif
 
 	g_thread_init (NULL);
-	gtk_set_locale ();
 	gtk_init (&argc, &argv);
 	g_set_application_name (_("Almanah Diary"));
 	gtk_window_set_default_icon_name ("almanah");
diff --git a/src/main.h b/src/main.h
index 3d55225..ee9ab90 100644
--- a/src/main.h
+++ b/src/main.h
@@ -55,6 +55,7 @@ typedef struct {
 
 extern Almanah *almanah;
 
+gboolean almanah_run_on_screen (GdkScreen *screen, const gchar *commandline, GError **error);
 void almanah_quit (void);
 
 G_END_DECLS
diff --git a/src/preferences-dialog.c b/src/preferences-dialog.c
index 5884a82..6c4e1be 100644
--- a/src/preferences-dialog.c
+++ b/src/preferences-dialog.c
@@ -23,9 +23,9 @@
 #include <gtk/gtk.h>
 #ifdef ENABLE_ENCRYPTION
 #define LIBCRYPTUI_API_SUBJECT_TO_CHANGE
-#include <libcryptui/cryptui-key-combo.h>
-#include <libcryptui/cryptui-keyset.h>
-#include <libcryptui/cryptui.h>
+#include <cryptui-key-combo.h>
+#include <cryptui-keyset.h>
+#include <cryptui.h>
 #include <atk/atk.h>
 #endif /* ENABLE_ENCRYPTION */
 
@@ -73,8 +73,9 @@ almanah_preferences_dialog_init (AlmanahPreferencesDialog *self)
 {
 	self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, ALMANAH_TYPE_PREFERENCES_DIALOG, AlmanahPreferencesDialogPrivate);
 
+#ifdef ENABLE_SPELL_CHECKING
 	g_signal_connect (self, "response", G_CALLBACK (pd_response_cb), self);
-	gtk_dialog_set_has_separator (GTK_DIALOG (self), FALSE);
+#endif /* ENABLE_SPELL_CHECKING */
 	gtk_window_set_modal (GTK_WINDOW (self), FALSE);
 	gtk_window_set_title (GTK_WINDOW (self), _("Almanah Preferences"));
 	gtk_widget_set_size_request (GTK_WIDGET (self), 400, -1);
@@ -260,10 +261,11 @@ pd_new_key_button_clicked_cb (GtkButton *button, AlmanahPreferencesDialog *prefe
 }
 #endif /* ENABLE_ENCRYPTION */
 
+#ifdef ENABLE_SPELL_CHECKING
 static void
 pd_response_cb (GtkDialog *dialog, gint response_id, AlmanahPreferencesDialog *preferences_dialog)
 {
-	gtk_widget_hide_all (GTK_WIDGET (dialog));
+	gtk_widget_hide (GTK_WIDGET (dialog));
 }
 
 static void
@@ -306,3 +308,5 @@ pd_spell_checking_enabled_check_button_toggled_cb (GtkToggleButton *toggle_butto
 	gconf_client_set_bool (almanah->gconf_client, "/apps/almanah/spell_checking_enabled",
 			       gtk_toggle_button_get_active (toggle_button), NULL);
 }
+
+#endif /* ENABLE_SPELL_CHECKING */
diff --git a/src/search-dialog.c b/src/search-dialog.c
index 2cc8fbe..702cb96 100644
--- a/src/search-dialog.c
+++ b/src/search-dialog.c
@@ -56,7 +56,6 @@ almanah_search_dialog_init (AlmanahSearchDialog *self)
 	self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, ALMANAH_TYPE_SEARCH_DIALOG, AlmanahSearchDialogPrivate);
 
 	g_signal_connect (self, "response", G_CALLBACK (sd_response_cb), self);
-	gtk_dialog_set_has_separator (GTK_DIALOG (self), FALSE);
 	gtk_window_set_modal (GTK_WINDOW (self), FALSE);
 	gtk_window_set_title (GTK_WINDOW (self), _("Search"));
 }
@@ -134,7 +133,7 @@ sd_response_cb (GtkDialog *dialog, gint response_id, AlmanahSearchDialog *search
 	gtk_list_store_clear (search_dialog->priv->sd_results_store);
 	gtk_entry_set_text (search_dialog->priv->sd_search_entry, "");
 
-	gtk_widget_hide_all (GTK_WIDGET (dialog));
+	gtk_widget_hide (GTK_WIDGET (dialog));
 }
 
 void
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]