wp
/
xed
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Fix some deprecations

This commit is contained in:
Stefano Karapetsas 2013-11-04 12:46:45 +01:00
parent c0bd4250ef
commit 76265841b7
10 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/spell/pluma-spell-language-dialog.c
View File

@ -139,7 +139,9 @@ create_dialog (PlumaSpellLanguageDialog *dlg,
NULL); NULL);
gtk_window_set_title (GTK_WINDOW (dlg), _("Set language")); gtk_window_set_title (GTK_WINDOW (dlg), _("Set language"));
#if !GTK_CHECK_VERSION (3, 0, 0)
gtk_dialog_set_has_separator (GTK_DIALOG (dlg), FALSE); gtk_dialog_set_has_separator (GTK_DIALOG (dlg), FALSE);
#endif
gtk_window_set_modal (GTK_WINDOW (dlg), TRUE); gtk_window_set_modal (GTK_WINDOW (dlg), TRUE);
gtk_window_set_destroy_with_parent (GTK_WINDOW (dlg), TRUE); gtk_window_set_destroy_with_parent (GTK_WINDOW (dlg), TRUE);

4
plugins/time/pluma-time-plugin.c
View File

@ -770,7 +770,9 @@ get_configure_dialog (PlumaTimePlugin *plugin)
} }
gtk_window_set_resizable (GTK_WINDOW (dialog->dialog), FALSE); gtk_window_set_resizable (GTK_WINDOW (dialog->dialog), FALSE);
#if !GTK_CHECK_VERSION (3, 0, 0)
gtk_dialog_set_has_separator (GTK_DIALOG (dialog->dialog), FALSE); gtk_dialog_set_has_separator (GTK_DIALOG (dialog->dialog), FALSE);
#endif
sf = get_selected_format (plugin); sf = get_selected_format (plugin);
create_formats_list (dialog->list, sf, plugin); create_formats_list (dialog->list, sf, plugin);
@ -934,7 +936,9 @@ get_choose_format_dialog (GtkWindow *parent,
gtk_window_group_add_window (wg, GTK_WINDOW (err_dialog)); gtk_window_group_add_window (wg, GTK_WINDOW (err_dialog));
gtk_window_set_resizable (GTK_WINDOW (err_dialog), FALSE); gtk_window_set_resizable (GTK_WINDOW (err_dialog), FALSE);
#if !GTK_CHECK_VERSION (3, 0, 0)
gtk_dialog_set_has_separator (GTK_DIALOG (err_dialog), FALSE); gtk_dialog_set_has_separator (GTK_DIALOG (err_dialog), FALSE);
#endif
gtk_dialog_set_default_response (GTK_DIALOG (err_dialog), GTK_RESPONSE_OK); gtk_dialog_set_default_response (GTK_DIALOG (err_dialog), GTK_RESPONSE_OK);
gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (err_dialog))), gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (err_dialog))),

4
pluma/pluma-document.c
View File

@ -39,7 +39,9 @@
#include <glib/gi18n.h> #include <glib/gi18n.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#if !GTK_CHECK_VERSION (3, 0, 0) #if GTK_CHECK_VERSION (3, 0, 0)
#include <gtksourceview/gtksource.h>
#else
#include <gtksourceview/gtksourceiter.h> #include <gtksourceview/gtksourceiter.h>
#endif #endif

6
pluma/pluma-window.c
View File

@ -3697,7 +3697,7 @@ bottom_panel_visibility_changed (PlumaPanel *bottom_panel,
gboolean visible; gboolean visible;
GtkAction *action; GtkAction *action;
visible = GTK_WIDGET_VISIBLE (bottom_panel); visible = GTK_WIDGET_VISIBLE (GTK_WIDGET (bottom_panel));
if (pluma_prefs_manager_bottom_panel_visible_can_set ()) if (pluma_prefs_manager_bottom_panel_visible_can_set ())
pluma_prefs_manager_set_bottom_panel_visible (visible); pluma_prefs_manager_set_bottom_panel_visible (visible);
@ -4169,7 +4169,7 @@ pluma_window_create_tab (PlumaWindow *window,
-1, -1,
jump_to); jump_to);
if (!GTK_WIDGET_VISIBLE (window)) if (!GTK_WIDGET_VISIBLE (GTK_WIDGET (window)))
{ {
gtk_window_present (GTK_WINDOW (window)); gtk_window_present (GTK_WINDOW (window));
} }
@ -4221,7 +4221,7 @@ pluma_window_create_tab_from_uri (PlumaWindow *window,
jump_to); jump_to);
if (!GTK_WIDGET_VISIBLE (window)) if (!GTK_WIDGET_VISIBLE (GTK_WIDGET (window)))
{ {
gtk_window_present (GTK_WINDOW (window)); gtk_window_present (GTK_WINDOW (window));
} }

2
pluma/pluma.c
View File

@ -397,7 +397,7 @@ on_message_received (const char *message,
* terminal. We also need to make sure that the window * terminal. We also need to make sure that the window
* has been realized otherwise it will not work. lame. * has been realized otherwise it will not work. lame.
*/ */
if (!gtk_widget_get_realized (window)) if (!gtk_widget_get_realized (GTK_WIDGET (window)))
gtk_widget_realize (GTK_WIDGET (window)); gtk_widget_realize (GTK_WIDGET (window));
#ifdef GDK_WINDOWING_X11 #ifdef GDK_WINDOWING_X11

2
tests/document-input-stream.c
View File

@ -140,7 +140,9 @@ test_consecutive_multibyte_big_read ()
int main (int argc, int main (int argc,
char *argv[]) char *argv[])
{ {
#if !GLIB_CHECK_VERSION (2, 36, 0)
g_type_init (); g_type_init ();
#endif
g_test_init (&argc, &argv, NULL); g_test_init (&argc, &argv, NULL);
g_test_add_func ("/document-input-stream/empty", test_empty); g_test_add_func ("/document-input-stream/empty", test_empty);

2
tests/document-loader.c
View File

@ -238,7 +238,9 @@ test_begin_new_line_detection ()
int main (int argc, int main (int argc,
char *argv[]) char *argv[])
{ {
#if !GLIB_CHECK_VERSION (2, 36, 0)
g_type_init (); g_type_init ();
#endif
g_test_init (&argc, &argv, NULL); g_test_init (&argc, &argv, NULL);
pluma_prefs_manager_app_init (); pluma_prefs_manager_app_init ();

2
tests/document-output-stream.c
View File

@ -119,7 +119,9 @@ test_big_char ()
int main (int argc, int main (int argc,
char *argv[]) char *argv[])
{ {
#if !GLIB_CHECK_VERSION (2, 36, 0)
g_type_init (); g_type_init ();
#endif
g_test_init (&argc, &argv, NULL); g_test_init (&argc, &argv, NULL);
pluma_prefs_manager_app_init (); pluma_prefs_manager_app_init ();

2
tests/document-saver.c
View File

@ -687,7 +687,9 @@ int main (int argc,
gboolean have_unowned; gboolean have_unowned;
gboolean have_unowned_group; gboolean have_unowned_group;
#if !GLIB_CHECK_VERSION (2, 36, 0)
g_type_init (); g_type_init ();
#endif
g_test_init (&argc, &argv, NULL); g_test_init (&argc, &argv, NULL);
pluma_prefs_manager_app_init (); pluma_prefs_manager_app_init ();

2
tests/smart-converter.c
View File

@ -341,7 +341,9 @@ test_guessed ()
int main (int argc, int main (int argc,
char *argv[]) char *argv[])
{ {
#if !GLIB_CHECK_VERSION (2, 36, 0)
g_type_init (); g_type_init ();
#endif
g_test_init (&argc, &argv, NULL); g_test_init (&argc, &argv, NULL);
g_test_add_func ("/smart-converter/utf8-utf8", test_utf8_utf8); g_test_add_func ("/smart-converter/utf8-utf8", test_utf8_utf8);