cpw.qulogic.gtk3: 64a8ae24: The function gtk_dialog_set_has_separato...
qulogic at pidgin.im
qulogic at pidgin.im
Sun Oct 9 04:34:36 EDT 2011
----------------------------------------------------------------------
Revision: 64a8ae2420edbcee9629c0983b9e301382f35bcb
Parent: cecd756d5ce5458f34f921b8361cfa8f0b383bd2
Author: qulogic at pidgin.im
Date: 10/08/11 20:17:12
Branch: im.pidgin.cpw.qulogic.gtk3
URL: http://d.pidgin.im/viewmtn/revision/info/64a8ae2420edbcee9629c0983b9e301382f35bcb
Changelog:
The function gtk_dialog_set_has_separator was removed in GTK+ 2.22.
Changes against parent cecd756d5ce5458f34f921b8361cfa8f0b383bd2
patched pidgin/gtkconv.c
patched pidgin/gtkdebug.c
patched pidgin/gtkdialogs.c
patched pidgin/gtklog.c
patched pidgin/gtknotify.c
patched pidgin/gtkrequest.c
patched pidgin/plugins/themeedit.c
patched pidgin/plugins/xmppconsole.c
-------------- next part --------------
============================================================
--- pidgin/gtkconv.c 465c258eeb9481f859268476797ee69ad60b8998
+++ pidgin/gtkconv.c 32b21d5a450f137b105a01d72ebfa5abacba3ad2
@@ -941,7 +941,9 @@ invite_cb(GtkWidget *widget, PidginConve
GTK_RESPONSE_OK);
gtk_container_set_border_width(GTK_CONTAINER(invite_dialog), PIDGIN_HIG_BOX_SPACE);
gtk_window_set_resizable(GTK_WINDOW(invite_dialog), FALSE);
+#if !GTK_CHECK_VERSION(2,22,0)
gtk_dialog_set_has_separator(GTK_DIALOG(invite_dialog), FALSE);
+#endif
info->window = GTK_WIDGET(invite_dialog);
@@ -8704,8 +8706,9 @@ build_warn_close_dialog(PidginWindow *gt
gtk_container_set_border_width(GTK_CONTAINER(warn_close_dialog),
6);
gtk_window_set_resizable(GTK_WINDOW(warn_close_dialog), FALSE);
- gtk_dialog_set_has_separator(GTK_DIALOG(warn_close_dialog),
- FALSE);
+#if !GTK_CHECK_VERSION(2,22,0)
+ gtk_dialog_set_has_separator(GTK_DIALOG(warn_close_dialog), FALSE);
+#endif
/* Setup the outside spacing. */
vbox = GTK_DIALOG(warn_close_dialog)->vbox;
============================================================
--- pidgin/gtkdebug.c 60f130088a75453cf7bfb2652abe3d6fae54be53
+++ pidgin/gtkdebug.c f8426fc49b7e7e33021a3f78510bb72de71ea44b
@@ -186,7 +186,9 @@ find_cb(GtkWidget *w, DebugWindow *win)
gtk_container_set_border_width(GTK_CONTAINER(win->find), PIDGIN_HIG_BOX_SPACE);
gtk_window_set_resizable(GTK_WINDOW(win->find), FALSE);
+#if !GTK_CHECK_VERSION(2,22,0)
gtk_dialog_set_has_separator(GTK_DIALOG(win->find), FALSE);
+#endif
gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(win->find)->vbox), PIDGIN_HIG_BORDER);
gtk_container_set_border_width(
GTK_CONTAINER(GTK_DIALOG(win->find)->vbox), PIDGIN_HIG_BOX_SPACE);
============================================================
--- pidgin/gtknotify.c 37ecbca7ee40c4b4ba70c9f972c5a9756954d055
+++ pidgin/gtknotify.c ac2319fc013ff53277e4a94347db774676c037ac
@@ -534,7 +534,9 @@ pidgin_notify_message(PurpleNotifyMsgTyp
gtk_container_set_border_width(GTK_CONTAINER(dialog), PIDGIN_HIG_BORDER);
gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
+#if !GTK_CHECK_VERSION(2,22,0)
gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
+#endif
gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog)->vbox), PIDGIN_HIG_BORDER);
gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), PIDGIN_HIG_BOX_SPACE);
@@ -1494,7 +1496,9 @@ pidgin_create_notification_dialog(Pidgin
/* Setup the dialog */
gtk_container_set_border_width(GTK_CONTAINER(dialog), PIDGIN_HIG_BOX_SPACE);
gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), PIDGIN_HIG_BOX_SPACE);
+#if !GTK_CHECK_VERSION(2,22,0)
gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
+#endif
gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog)->vbox), PIDGIN_HIG_BORDER);
/* Vertical box */
============================================================
--- pidgin/gtkrequest.c 13f8624fe513ec0a0ead8968eddb6828b6a83f27
+++ pidgin/gtkrequest.c 9a7b1178b56346565f239204e45deadba3515748
@@ -362,7 +362,9 @@ pidgin_request_input(const char *title,
gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), PIDGIN_HIG_BORDER/2);
if (!multiline)
gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
+#if !GTK_CHECK_VERSION(2,22,0)
gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
+#endif
gtk_dialog_set_default_response(GTK_DIALOG(dialog), 0);
gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog)->vbox), PIDGIN_HIG_BORDER);
@@ -528,7 +530,9 @@ pidgin_request_choice(const char *title,
gtk_container_set_border_width(GTK_CONTAINER(dialog), PIDGIN_HIG_BORDER/2);
gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), PIDGIN_HIG_BORDER/2);
gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
+#if !GTK_CHECK_VERSION(2,22,0)
gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
+#endif
gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog)->vbox), PIDGIN_HIG_BORDER);
/* Setup the main horizontal box */
@@ -650,7 +654,9 @@ pidgin_request_action_with_icon(const ch
gtk_container_set_border_width(GTK_CONTAINER(dialog), PIDGIN_HIG_BORDER/2);
gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), PIDGIN_HIG_BORDER/2);
gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
+#if !GTK_CHECK_VERSION(2,22,0)
gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
+#endif
gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog)->vbox), PIDGIN_HIG_BORDER);
/* Setup the main horizontal box */
============================================================
--- pidgin/gtklog.c 17a0b41148c50957bd4c16490c0eb0490041f642
+++ pidgin/gtklog.c 44a45ba9d6fd6476019345d45e77fc6969b0bdfd
@@ -575,7 +575,9 @@ static PidginLogViewer *display_log_view
gtk_dialog_add_button(GTK_DIALOG(lv->window), _("_Browse logs folder"), GTK_RESPONSE_HELP);
#endif
gtk_container_set_border_width (GTK_CONTAINER(lv->window), PIDGIN_HIG_BOX_SPACE);
+#if !GTK_CHECK_VERSION(2,22,0)
gtk_dialog_set_has_separator(GTK_DIALOG(lv->window), FALSE);
+#endif
gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(lv->window)->vbox), 0);
g_signal_connect(G_OBJECT(lv->window), "response",
G_CALLBACK(destroy_cb), ht);
============================================================
--- pidgin/gtkdialogs.c 71888f0393d70be77133b6fc846da880e2df5017
+++ pidgin/gtkdialogs.c 2dde71ada153e455e932abbfe3a47f5ece1fc692
@@ -947,7 +947,9 @@ pidgin_dialogs_ee(const char *ee)
gtk_container_set_border_width (GTK_CONTAINER(window), PIDGIN_HIG_BOX_SPACE);
gtk_window_set_resizable(GTK_WINDOW(window), FALSE);
+#if !GTK_CHECK_VERSION(2,22,0)
gtk_dialog_set_has_separator(GTK_DIALOG(window), FALSE);
+#endif
gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(window)->vbox), PIDGIN_HIG_BORDER);
gtk_container_set_border_width (GTK_CONTAINER(GTK_DIALOG(window)->vbox), PIDGIN_HIG_BOX_SPACE);
============================================================
--- pidgin/plugins/xmppconsole.c 479fbed8e1b986efd0b809952f684dc6c3d2f42b
+++ pidgin/plugins/xmppconsole.c 3ca6150c7a217feae47171a6f5a0d469ecc2cc6c
@@ -274,7 +274,9 @@ static void iq_clicked_cb(GtkWidget *w,
GTK_STOCK_OK,
GTK_RESPONSE_ACCEPT,
NULL);
+#if !GTK_CHECK_VERSION(2,22,0)
gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
+#endif
gtk_dialog_set_default_response (GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT);
gtk_container_set_border_width(GTK_CONTAINER(dialog), 12);
#if GTK_CHECK_VERSION(2,14,0)
@@ -362,7 +364,9 @@ static void presence_clicked_cb(GtkWidge
GTK_STOCK_OK,
GTK_RESPONSE_ACCEPT,
NULL);
+#if !GTK_CHECK_VERSION(2,22,0)
gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
+#endif
gtk_dialog_set_default_response (GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT);
gtk_container_set_border_width(GTK_CONTAINER(dialog), 12);
#if GTK_CHECK_VERSION(2,14,0)
@@ -520,7 +524,9 @@ static void message_clicked_cb(GtkWidget
GTK_STOCK_OK,
GTK_RESPONSE_ACCEPT,
NULL);
+#if !GTK_CHECK_VERSION(2,22,0)
gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
+#endif
gtk_dialog_set_default_response (GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT);
gtk_container_set_border_width(GTK_CONTAINER(dialog), 12);
#if GTK_CHECK_VERSION(2,14,0)
============================================================
--- pidgin/plugins/themeedit.c a5e7c0f75f457036f15048f6c02845e00bc493de
+++ pidgin/plugins/themeedit.c 2f0d0e9408ea58753ccf682fd30ba01b4391b45d
@@ -306,7 +306,9 @@ pidgin_blist_theme_edit(PurplePluginActi
}
}
+#if !GTK_CHECK_VERSION(2,22,0)
gtk_dialog_set_has_separator(GTK_DIALOG(dialog), TRUE);
+#endif
#ifdef NOT_SADRUL
pidgin_dialog_add_button(GTK_DIALOG(dialog), GTK_STOCK_SAVE, G_CALLBACK(save_blist_theme), dialog);
#endif
More information about the Commits
mailing list