diff options
author | Christian Grothoff <christian@grothoff.org> | 2014-06-02 21:10:49 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2014-06-02 21:10:49 +0000 |
commit | 6f7857ee10e2f05e91fe1b30c854d073e15747c2 (patch) | |
tree | 41fee0280c7e7f02796a96f62c9fa92a8a99b011 /src/fs | |
parent | 84a6a4b4466a0920b8ff7e0c59ee139d13f7a3d3 (diff) | |
download | gnunet-gtk-6f7857ee10e2f05e91fe1b30c854d073e15747c2.tar.gz gnunet-gtk-6f7857ee10e2f05e91fe1b30c854d073e15747c2.zip |
make gnunet-gtk work with gtk3 widgets
Diffstat (limited to 'src/fs')
-rw-r--r-- | src/fs/gnunet-fs-gtk.c | 6 | ||||
-rw-r--r-- | src/fs/gnunet-fs-gtk.h | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/fs/gnunet-fs-gtk.c b/src/fs/gnunet-fs-gtk.c index ec397b7c..f9c2f858 100644 --- a/src/fs/gnunet-fs-gtk.c +++ b/src/fs/gnunet-fs-gtk.c | |||
@@ -426,7 +426,9 @@ unique_app_message_cb (UniqueApp *app, | |||
426 | struct GNUNET_GTK_MainWindowContext *main_context = user_data; | 426 | struct GNUNET_GTK_MainWindowContext *main_context = user_data; |
427 | 427 | ||
428 | /* raise the window */ | 428 | /* raise the window */ |
429 | gtk_window_present_with_time (GTK_WINDOW (main_context->main_window), time_); | 429 | if (GTK_IS_WINDOW (main_context->main_window)) |
430 | gtk_window_present_with_time (GTK_WINDOW (main_context->main_window), | ||
431 | time_); | ||
430 | 432 | ||
431 | switch (command) | 433 | switch (command) |
432 | { | 434 | { |
@@ -720,7 +722,7 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
720 | main_context.download_anonymity_combo = GTK_COMBO_BOX (GNUNET_FS_GTK_get_main_window_object ("main_window_download_anonymity_combobox")); | 722 | main_context.download_anonymity_combo = GTK_COMBO_BOX (GNUNET_FS_GTK_get_main_window_object ("main_window_download_anonymity_combobox")); |
721 | main_context.download_recursive_checkbutton = GTK_CHECK_BUTTON (GNUNET_FS_GTK_get_main_window_object ("GNUNET_GTK_search_frame_download_recursive_checkbox")); | 723 | main_context.download_recursive_checkbutton = GTK_CHECK_BUTTON (GNUNET_FS_GTK_get_main_window_object ("GNUNET_GTK_search_frame_download_recursive_checkbox")); |
722 | main_context.download_download_button = GTK_BUTTON (GNUNET_FS_GTK_get_main_window_object ("GNUNET_GTK_search_frame_download_download_button")); | 724 | main_context.download_download_button = GTK_BUTTON (GNUNET_FS_GTK_get_main_window_object ("GNUNET_GTK_search_frame_download_download_button")); |
723 | main_context.download_panel = GTK_VBOX (GNUNET_FS_GTK_get_main_window_object ("GNUNET_GTK_search_frame_download_vbox")); | 725 | main_context.download_panel = GTK_BOX (GNUNET_FS_GTK_get_main_window_object ("GNUNET_GTK_search_frame_download_vbox")); |
724 | 726 | ||
725 | main_context.notebook = GTK_NOTEBOOK (GNUNET_FS_GTK_get_main_window_object ("GNUNET_GTK_main_window_notebook")); | 727 | main_context.notebook = GTK_NOTEBOOK (GNUNET_FS_GTK_get_main_window_object ("GNUNET_GTK_main_window_notebook")); |
726 | 728 | ||
diff --git a/src/fs/gnunet-fs-gtk.h b/src/fs/gnunet-fs-gtk.h index 3dab8bcf..20a564db 100644 --- a/src/fs/gnunet-fs-gtk.h +++ b/src/fs/gnunet-fs-gtk.h | |||
@@ -203,7 +203,7 @@ struct GNUNET_GTK_MainWindowContext | |||
203 | GtkComboBox *download_anonymity_combo; | 203 | GtkComboBox *download_anonymity_combo; |
204 | GtkCheckButton *download_recursive_checkbutton; | 204 | GtkCheckButton *download_recursive_checkbutton; |
205 | GtkButton *download_download_button; | 205 | GtkButton *download_download_button; |
206 | GtkVBox *download_panel; | 206 | GtkBox *download_panel; |
207 | 207 | ||
208 | GtkNotebook *notebook; | 208 | GtkNotebook *notebook; |
209 | 209 | ||