[ekiga/ds-gtk3-new] Fixed all occurences of GTK+-3.0 methods.
- From: Damien Sandras <dsandras src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ekiga/ds-gtk3-new] Fixed all occurences of GTK+-3.0 methods.
- Date: Sat, 16 Mar 2013 16:33:33 +0000 (UTC)
commit 162407847d21f3403496ad895f924e165a9d8f7c
Author: Damien Sandras <dsandras beip be>
Date: Sat Mar 16 17:17:02 2013 +0100
Fixed all occurences of GTK+-3.0 methods.
lib/engine/gui/gtk-core/codecsbox.cpp | 2 +-
lib/engine/gui/gtk-core/form-dialog-gtk.cpp | 6 +-
lib/engine/gui/gtk-frontend/accounts-window.cpp | 6 +-
lib/engine/gui/gtk-frontend/addressbook-window.cpp | 4 +-
lib/engine/gui/gtk-frontend/book-view-gtk.cpp | 4 +-
lib/engine/gui/gtk-frontend/call-window.cpp | 58 +++++++++++---------
lib/engine/gui/gtk-frontend/chat-area.cpp | 20 +++++--
lib/engine/gui/gtk-frontend/chat-window.cpp | 2 +-
lib/engine/gui/gtk-frontend/ext-window.cpp | 4 +-
lib/engine/gui/gtk-frontend/preferences-window.cpp | 6 +-
lib/engine/gui/gtk-frontend/roster-view-gtk.cpp | 2 +-
lib/engine/gui/gtk-frontend/statusmenu.cpp | 6 +-
lib/gui/dialpad.c | 2 +-
lib/gui/gm-cell-renderer-bitext.c | 7 +--
lib/gui/gmentrydialog.c | 2 +-
lib/gui/gmpreferences.c | 20 ++++----
src/gui/assistant.cpp | 14 +-----
src/gui/main_window.cpp | 4 +-
18 files changed, 85 insertions(+), 84 deletions(-)
---
diff --git a/lib/engine/gui/gtk-core/codecsbox.cpp b/lib/engine/gui/gtk-core/codecsbox.cpp
index c6e918d..df1a7d8 100644
--- a/lib/engine/gui/gtk-core/codecsbox.cpp
+++ b/lib/engine/gui/gtk-core/codecsbox.cpp
@@ -440,7 +440,7 @@ codecs_box_init (CodecsBox *self)
/* The buttons */
alignment = gtk_alignment_new (1, 0.5, 0, 0);
- buttons_vbox = gtk_vbox_new (TRUE, 6);
+ buttons_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
gtk_container_add (GTK_CONTAINER (alignment), buttons_vbox);
diff --git a/lib/engine/gui/gtk-core/form-dialog-gtk.cpp b/lib/engine/gui/gtk-core/form-dialog-gtk.cpp
index 69ae48f..3a51ae5 100644
--- a/lib/engine/gui/gtk-core/form-dialog-gtk.cpp
+++ b/lib/engine/gui/gtk-core/form-dialog-gtk.cpp
@@ -642,12 +642,12 @@ FormDialog::FormDialog (Ekiga::FormRequestPtr _request,
GTK_RESPONSE_ACCEPT);
gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
- vbox = gtk_vbox_new (FALSE, 0);
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (window))), vbox, FALSE, FALSE, 0);
gtk_widget_show (vbox);
- preamble = gtk_vbox_new (FALSE, 0);
+ preamble = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_box_pack_start (GTK_BOX (vbox), preamble, FALSE, FALSE, 0);
fields = gtk_table_new (0, 2, FALSE);
@@ -1299,7 +1299,7 @@ FormDialog::editable_set (const std::string name,
0, 0);
}
- hbox = gtk_hbox_new (FALSE, 2);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
entry = gtk_entry_new ();
button = gtk_button_new_with_label (_("Add Group"));
gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 2);
diff --git a/lib/engine/gui/gtk-frontend/accounts-window.cpp b/lib/engine/gui/gtk-frontend/accounts-window.cpp
index a6c9ab7..d253276 100644
--- a/lib/engine/gui/gtk-frontend/accounts-window.cpp
+++ b/lib/engine/gui/gtk-frontend/accounts-window.cpp
@@ -567,7 +567,7 @@ accounts_window_new (Ekiga::ServiceCore &core)
self->priv->details = core.get<Ekiga::PersonalDetails> ("personal-details");
self->priv->account_core = core.get<Ekiga::AccountCore> ("account-core");
- vbox = gtk_vbox_new (FALSE, 2);
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
gtk_window_set_title (GTK_WINDOW (self), _("Accounts"));
/* The menu */
@@ -649,7 +649,7 @@ accounts_window_new (Ekiga::ServiceCore &core)
GTK_POLICY_AUTOMATIC);
event_box = gtk_event_box_new ();
- hbox = gtk_hbox_new (FALSE, 4);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 12);
gtk_container_add (GTK_CONTAINER (event_box), hbox);
@@ -665,7 +665,7 @@ accounts_window_new (Ekiga::ServiceCore &core)
/* setting up a horizontal button box
* (each button with be dynamically disabled/enabled as needed)
*/
- button_box = gtk_vbutton_box_new ();
+ button_box = gtk_button_box_new (GTK_ORIENTATION_VERTICAL);
gtk_button_box_set_layout (GTK_BUTTON_BOX (button_box), GTK_BUTTONBOX_CENTER);
button = gtk_button_new_with_mnemonic (_("_Enable"));
gtk_box_pack_start (GTK_BOX (button_box), button, FALSE, FALSE, 3);
diff --git a/lib/engine/gui/gtk-frontend/addressbook-window.cpp
b/lib/engine/gui/gtk-frontend/addressbook-window.cpp
index 0d93b60..c3a4ae8 100644
--- a/lib/engine/gui/gtk-frontend/addressbook-window.cpp
+++ b/lib/engine/gui/gtk-frontend/addressbook-window.cpp
@@ -628,7 +628,7 @@ addressbook_window_new (Ekiga::ContactCore &core)
gtk_window_set_icon_name (GTK_WINDOW (self), "x-office-address-book");
/* Start building the window */
- vbox = gtk_vbox_new (FALSE, 2);
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
/* The menu */
menu_bar = gtk_menu_bar_new ();
@@ -660,7 +660,7 @@ addressbook_window_new (Ekiga::ContactCore &core)
/* A hpaned to put the list of Books and their content */
- hpaned = gtk_hpaned_new ();
+ hpaned = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
gtk_container_set_border_width (GTK_CONTAINER (hpaned), 6);
gtk_container_add (GTK_CONTAINER (vbox), hpaned);
diff --git a/lib/engine/gui/gtk-frontend/book-view-gtk.cpp b/lib/engine/gui/gtk-frontend/book-view-gtk.cpp
index 80e280f..461c651 100644
--- a/lib/engine/gui/gtk-frontend/book-view-gtk.cpp
+++ b/lib/engine/gui/gtk-frontend/book-view-gtk.cpp
@@ -517,7 +517,7 @@ book_view_gtk_new (Ekiga::BookPtr book)
result = (BookViewGtk *) g_object_new (BOOK_VIEW_GTK_TYPE, NULL);
result->priv = new _BookViewGtkPrivate (book);
- result->priv->vbox = gtk_vbox_new (FALSE, 0);
+ result->priv->vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_frame_set_shadow_type (GTK_FRAME (result), GTK_SHADOW_NONE);
/* The List Store */
@@ -575,7 +575,7 @@ book_view_gtk_new (Ekiga::BookPtr book)
if (filtered) {
- hbox = gtk_hbox_new (FALSE, 0);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
result->priv->entry = gtk_entry_new ();
button = gtk_button_new_from_stock (GTK_STOCK_FIND);
label = gtk_label_new_with_mnemonic (_("_Search Filter:"));
diff --git a/lib/engine/gui/gtk-frontend/call-window.cpp b/lib/engine/gui/gtk-frontend/call-window.cpp
index a6e1037..340a730 100644
--- a/lib/engine/gui/gtk-frontend/call-window.cpp
+++ b/lib/engine/gui/gtk-frontend/call-window.cpp
@@ -51,7 +51,7 @@
#include "gmconf.h"
#include <boost/smart_ptr.hpp>
#include "gmmenuaddon.h"
-#include "gmlevelmeter.h"
+//#include "gmlevelmeter.h"
#include "gmpowermeter.h"
#include "trigger.h"
#include "scoped-connections.h"
@@ -692,12 +692,12 @@ video_settings_changed_cb (GtkAdjustment * /*adjustment*/,
}
static gboolean
-on_signal_level_refresh_cb (gpointer self)
+on_signal_level_refresh_cb (gpointer /*self*/)
{
- EkigaCallWindow *cw = EKIGA_CALL_WINDOW (self);
+ //EkigaCallWindow *cw = EKIGA_CALL_WINDOW (self);
- gm_level_meter_set_level (GM_LEVEL_METER (cw->priv->output_signal),
cw->priv->audiooutput_core->get_average_level());
- gm_level_meter_set_level (GM_LEVEL_METER (cw->priv->input_signal),
cw->priv->audioinput_core->get_average_level());
+ //gm_level_meter_set_level (GM_LEVEL_METER (cw->priv->output_signal),
cw->priv->audiooutput_core->get_average_level());
+ //gm_level_meter_set_level (GM_LEVEL_METER (cw->priv->input_signal),
cw->priv->audioinput_core->get_average_level());
return true;
}
@@ -1478,8 +1478,8 @@ ekiga_call_window_clear_signal_levels (EkigaCallWindow *cw)
{
g_return_if_fail (EKIGA_IS_CALL_WINDOW (cw));
- gm_level_meter_clear (GM_LEVEL_METER (cw->priv->output_signal));
- gm_level_meter_clear (GM_LEVEL_METER (cw->priv->input_signal));
+ //gm_level_meter_clear (GM_LEVEL_METER (cw->priv->output_signal));
+ //gm_level_meter_clear (GM_LEVEL_METER (cw->priv->input_signal));
}
static void
@@ -1754,17 +1754,18 @@ gm_cw_video_settings_window_new (EkigaCallWindow *cw)
gtk_container_set_border_width (GTK_CONTAINER (cw->priv->video_settings_frame), 5);
/* Category */
- vbox = gtk_vbox_new (false, 0);
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_add (GTK_CONTAINER (cw->priv->video_settings_frame), vbox);
/* Brightness */
- hbox = gtk_hbox_new (false, 0);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
image = gtk_image_new_from_icon_name ("brightness", GTK_ICON_SIZE_MENU);
gtk_box_pack_start (GTK_BOX (hbox), image, false, false, 0);
cw->priv->adj_brightness = gtk_adjustment_new (brightness, 0.0,
255.0, 1.0, 5.0, 1.0);
- hscale_brightness = gtk_hscale_new (GTK_ADJUSTMENT (cw->priv->adj_brightness));
+ hscale_brightness = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL,
+ GTK_ADJUSTMENT (cw->priv->adj_brightness));
gtk_scale_set_draw_value (GTK_SCALE (hscale_brightness), false);
gtk_scale_set_value_pos (GTK_SCALE (hscale_brightness), GTK_POS_RIGHT);
gtk_box_pack_start (GTK_BOX (hbox), hscale_brightness, true, true, 2);
@@ -1777,13 +1778,14 @@ gm_cw_video_settings_window_new (EkigaCallWindow *cw)
(gpointer) cw);
/* Whiteness */
- hbox = gtk_hbox_new (false, 0);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
image = gtk_image_new_from_icon_name ("whiteness", GTK_ICON_SIZE_MENU);
gtk_box_pack_start (GTK_BOX (hbox), image, false, false, 0);
cw->priv->adj_whiteness = gtk_adjustment_new (whiteness, 0.0,
255.0, 1.0, 5.0, 1.0);
- hscale_whiteness = gtk_hscale_new (GTK_ADJUSTMENT (cw->priv->adj_whiteness));
+ hscale_whiteness = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL,
+ GTK_ADJUSTMENT (cw->priv->adj_whiteness));
gtk_scale_set_draw_value (GTK_SCALE (hscale_whiteness), false);
gtk_scale_set_value_pos (GTK_SCALE (hscale_whiteness), GTK_POS_RIGHT);
gtk_box_pack_start (GTK_BOX (hbox), hscale_whiteness, true, true, 2);
@@ -1796,13 +1798,14 @@ gm_cw_video_settings_window_new (EkigaCallWindow *cw)
(gpointer) cw);
/* Colour */
- hbox = gtk_hbox_new (false, 0);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
image = gtk_image_new_from_icon_name ("color", GTK_ICON_SIZE_MENU);
gtk_box_pack_start (GTK_BOX (hbox), image, false, false, 0);
cw->priv->adj_colour = gtk_adjustment_new (colour, 0.0,
255.0, 1.0, 5.0, 1.0);
- hscale_colour = gtk_hscale_new (GTK_ADJUSTMENT (cw->priv->adj_colour));
+ hscale_colour = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL,
+ GTK_ADJUSTMENT (cw->priv->adj_colour));
gtk_scale_set_draw_value (GTK_SCALE (hscale_colour), false);
gtk_scale_set_value_pos (GTK_SCALE (hscale_colour), GTK_POS_RIGHT);
gtk_box_pack_start (GTK_BOX (hbox), hscale_colour, true, true, 2);
@@ -1815,13 +1818,14 @@ gm_cw_video_settings_window_new (EkigaCallWindow *cw)
(gpointer) cw);
/* Contrast */
- hbox = gtk_hbox_new (false, 0);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
image = gtk_image_new_from_icon_name ("contrast", GTK_ICON_SIZE_MENU);
gtk_box_pack_start (GTK_BOX (hbox), image, false, false, 0);
cw->priv->adj_contrast = gtk_adjustment_new (contrast, 0.0,
255.0, 1.0, 5.0, 1.0);
- hscale_contrast = gtk_hscale_new (GTK_ADJUSTMENT (cw->priv->adj_contrast));
+ hscale_contrast = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL,
+ GTK_ADJUSTMENT (cw->priv->adj_contrast));
gtk_scale_set_draw_value (GTK_SCALE (hscale_contrast), false);
gtk_scale_set_value_pos (GTK_SCALE (hscale_contrast), GTK_POS_RIGHT);
gtk_box_pack_start (GTK_BOX (hbox), hscale_contrast, true, true, 2);
@@ -1879,18 +1883,19 @@ gm_cw_audio_settings_window_new (EkigaCallWindow *cw)
/* The vbox */
- vbox = gtk_vbox_new (false, 0);
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_add (GTK_CONTAINER (cw->priv->audio_output_volume_frame), vbox);
/* Output volume */
- hbox = gtk_hbox_new (false, 0);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start (GTK_BOX (hbox),
gtk_image_new_from_icon_name ("audio-volume", GTK_ICON_SIZE_SMALL_TOOLBAR),
false, false, 0);
- small_vbox = gtk_vbox_new (false, 0);
+ small_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
cw->priv->adj_output_volume = gtk_adjustment_new (0, 0.0, 101.0, 1.0, 5.0, 1.0);
- hscale_play = gtk_hscale_new (GTK_ADJUSTMENT (cw->priv->adj_output_volume));
+ hscale_play = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL,
+ GTK_ADJUSTMENT (cw->priv->adj_output_volume));
gtk_scale_set_value_pos (GTK_SCALE (hscale_play), GTK_POS_RIGHT);
gtk_scale_set_draw_value (GTK_SCALE (hscale_play), false);
gtk_box_pack_start (GTK_BOX (small_vbox), hscale_play, true, true, 0);
@@ -1912,19 +1917,20 @@ gm_cw_audio_settings_window_new (EkigaCallWindow *cw)
gtk_container_set_border_width (GTK_CONTAINER (cw->priv->audio_input_volume_frame), 5);
/* The vbox */
- vbox = gtk_vbox_new (false, 0);
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_add (GTK_CONTAINER (cw->priv->audio_input_volume_frame), vbox);
/* Input volume */
- hbox = gtk_hbox_new (false, 0);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start (GTK_BOX (hbox),
gtk_image_new_from_icon_name ("audio-input-microphone",
GTK_ICON_SIZE_SMALL_TOOLBAR),
false, false, 0);
- small_vbox = gtk_vbox_new (false, 0);
+ small_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
cw->priv->adj_input_volume = gtk_adjustment_new (0, 0.0, 101.0, 1.0, 5.0, 1.0);
- hscale_rec = gtk_hscale_new (GTK_ADJUSTMENT (cw->priv->adj_input_volume));
+ hscale_rec = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL,
+ GTK_ADJUSTMENT (cw->priv->adj_input_volume));
gtk_scale_set_value_pos (GTK_SCALE (hscale_rec), GTK_POS_RIGHT);
gtk_scale_set_draw_value (GTK_SCALE (hscale_rec), false);
gtk_box_pack_start (GTK_BOX (small_vbox), hscale_rec, true, true, 0);
@@ -2312,7 +2318,7 @@ ekiga_call_window_init_gui (EkigaCallWindow *cw)
/* The main table */
event_box = gtk_event_box_new ();
- vbox = gtk_vbox_new (false, 0);
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
frame = gtk_frame_new (NULL);
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE);
event_box = gtk_event_box_new ();
@@ -2346,7 +2352,7 @@ ekiga_call_window_init_gui (EkigaCallWindow *cw)
/* The frame that contains information about the call */
cw->priv->call_frame = gtk_frame_new (NULL);
gtk_frame_set_shadow_type (GTK_FRAME (cw->priv->call_frame), GTK_SHADOW_NONE);
- hbox = gtk_hbox_new (false, 0);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
cw->priv->camera_image = gtk_image_new_from_icon_name ("camera-web", GTK_ICON_SIZE_LARGE_TOOLBAR);
gtk_box_pack_start (GTK_BOX (hbox), cw->priv->camera_image, false, false, 12);
diff --git a/lib/engine/gui/gtk-frontend/chat-area.cpp b/lib/engine/gui/gtk-frontend/chat-area.cpp
index 2d17372..cc7e6e1 100644
--- a/lib/engine/gui/gtk-frontend/chat-area.cpp
+++ b/lib/engine/gui/gtk-frontend/chat-area.cpp
@@ -261,7 +261,7 @@ on_motion_notify_event (GtkWidget* widget,
G_GNUC_UNUSED gpointer data)
{
gboolean result = FALSE;
- GdkModifierType state;
+ GdkModifierType state;
gint xwin = 0;
gint ywin = 0;
gint xbuf = 0;
@@ -271,8 +271,12 @@ on_motion_notify_event (GtkWidget* widget,
GSList* tmp_tags = NULL;
GtkTextTag* tag = NULL;
GdkCursor* cursor = NULL;
+ GdkDeviceManager* device_manager= NULL;
+ GdkDevice* pointer= NULL;
- gdk_window_get_pointer (event->window, &xwin, &ywin, &state);
+ device_manager = gdk_display_get_device_manager (gdk_window_get_display (event->window));
+ pointer = gdk_device_manager_get_client_pointer (device_manager);
+ gdk_window_get_device_position (event->window, pointer, &xwin, &ywin, &state);
gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (widget),
GTK_TEXT_WINDOW_WIDGET,
xwin, ywin,
@@ -429,6 +433,10 @@ on_extlink_tag_event (GtkTextTag* tag,
case GDK_GRAB_BROKEN:
case GDK_DAMAGE:
case GDK_EVENT_LAST:
+ case GDK_TOUCH_BEGIN:
+ case GDK_TOUCH_UPDATE:
+ case GDK_TOUCH_END:
+ case GDK_TOUCH_CANCEL:
default:
result = FALSE; // nothing
break; // nothing
@@ -724,7 +732,7 @@ chat_area_init (ChatArea* self)
{
GdkCursor* cursor = gdk_cursor_new (GDK_HAND2);
g_object_set_data_full (G_OBJECT (tag), "cursor", cursor,
- (GDestroyNotify)gdk_cursor_unref);
+ (GDestroyNotify) g_object_unref);
}
helper = gm_text_extlink_new ("\\<(http[s]?|[s]?ftp)://[^[:blank:]]+\\>", tag);
gm_text_buffer_enhancer_add_helper (self->priv->enhancer, helper);
@@ -798,14 +806,14 @@ chat_area_init (ChatArea* self)
GtkWidget* smiley_chooser_button = NULL;
frame = gtk_frame_new (NULL);
- vbox = gtk_vbox_new (FALSE, 2);
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
gtk_container_set_border_width (GTK_CONTAINER (frame), 5);
gtk_paned_pack2 (GTK_PANED (self), frame, TRUE, TRUE);
gtk_container_add (GTK_CONTAINER (frame), vbox);
gtk_widget_show_all (frame);
- bbox = gtk_hbutton_box_new ();
+ bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
/* FIXME gtk_box_set_spacing() seems to be neccesary, though we
define a padding with the pack() methods */
/* FIXME the box doesn't do the 2px space at the left and right edges! */
@@ -868,7 +876,7 @@ chat_area_init (ChatArea* self)
FALSE, TRUE, 2);
gtk_widget_show (button);
- sep = gtk_hseparator_new ();
+ sep = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
gtk_box_pack_start (GTK_BOX (vbox), sep, FALSE, FALSE, 0);
self->priv->message = gtk_text_view_new ();
diff --git a/lib/engine/gui/gtk-frontend/chat-window.cpp b/lib/engine/gui/gtk-frontend/chat-window.cpp
index bbde78e..82d5f5d 100644
--- a/lib/engine/gui/gtk-frontend/chat-window.cpp
+++ b/lib/engine/gui/gtk-frontend/chat-window.cpp
@@ -317,7 +317,7 @@ on_simple_chat_added (ChatWindow* self,
GtkWidget* close_image = NULL;
page = simple_chat_page_new (chat);
- hbox = gtk_hbox_new (FALSE, 2);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
label = gtk_label_new (chat->get_title ().c_str ());
g_object_set_data_full (G_OBJECT (label), "base-title",
diff --git a/lib/engine/gui/gtk-frontend/ext-window.cpp b/lib/engine/gui/gtk-frontend/ext-window.cpp
index f7384dd..368d844 100644
--- a/lib/engine/gui/gtk-frontend/ext-window.cpp
+++ b/lib/engine/gui/gtk-frontend/ext-window.cpp
@@ -84,10 +84,10 @@ gui_layout (EkigaExtWindow *ew)
{
GtkWidget *zin, *zout, *vbox, *hbox;
- vbox = gtk_vbox_new (FALSE, 0);
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_add (GTK_CONTAINER (ew), vbox);
- hbox = gtk_hbox_new (FALSE, 0);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
zin = gtk_button_new_from_stock (GTK_STOCK_ZOOM_IN);
diff --git a/lib/engine/gui/gtk-frontend/preferences-window.cpp
b/lib/engine/gui/gtk-frontend/preferences-window.cpp
index 1912736..a5119c6 100644
--- a/lib/engine/gui/gtk-frontend/preferences-window.cpp
+++ b/lib/engine/gui/gtk-frontend/preferences-window.cpp
@@ -536,7 +536,7 @@ gm_pw_init_sound_events_page (GtkWidget *prefs_window,
_("Ekiga Sound Events"),
1, 1);
- vbox = gtk_vbox_new (FALSE, 0);
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_table_attach (GTK_TABLE (subsection), vbox, 0, 1, 0, 1,
(GtkAttachOptions) (GTK_SHRINK),
(GtkAttachOptions) (GTK_SHRINK),
@@ -590,7 +590,7 @@ gm_pw_init_sound_events_page (GtkWidget *prefs_window,
gtk_tree_view_append_column (GTK_TREE_VIEW (pw->sound_events_list), column);
gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (column), 325);
- hbox = gtk_hbox_new (FALSE, 0);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 2);
pw->fsbutton =
@@ -607,7 +607,7 @@ gm_pw_init_sound_events_page (GtkWidget *prefs_window,
#endif
gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (pw->fsbutton), filefilter);
- selector_hbox = gtk_hbox_new (FALSE, 0);
+ selector_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
selector_playbutton = gtk_button_new_with_label (_("Play"));
gtk_box_pack_end (GTK_BOX (selector_hbox),
selector_playbutton, FALSE, FALSE, 0);
diff --git a/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp b/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp
index 087af0d..63380de 100644
--- a/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp
+++ b/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp
@@ -1404,7 +1404,7 @@ roster_view_gtk_init (G_GNUC_UNUSED RosterViewGtk* self)
self->priv->folded_groups = gm_conf_get_string_list (CONTACTS_KEY "roster_folded_groups");
self->priv->show_offline_contacts = gm_conf_get_bool (CONTACTS_KEY "show_offline_contacts");
- vbox = gtk_vbox_new (FALSE, 0);
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
scrolled_window = gtk_scrolled_window_new (NULL, NULL);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 0);
gtk_container_set_border_width (GTK_CONTAINER (scrolled_window), 0);
diff --git a/lib/engine/gui/gtk-frontend/statusmenu.cpp b/lib/engine/gui/gtk-frontend/statusmenu.cpp
index baf650c..c38733f 100644
--- a/lib/engine/gui/gtk-frontend/statusmenu.cpp
+++ b/lib/engine/gui/gtk-frontend/statusmenu.cpp
@@ -536,7 +536,7 @@ status_menu_clear_status_message_dialog_run (StatusMenu *self)
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE);
gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_DELETE);
- vbox = gtk_vbox_new (false, 0);
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), vbox, false, false, 2);
@@ -681,11 +681,11 @@ status_menu_new_status_message_dialog_run (StatusMenu *self,
NULL);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
- vbox = gtk_vbox_new (false, 0);
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), vbox, false, false, 2);
- hbox = gtk_hbox_new (false, 2);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
gtk_window_set_icon_name (GTK_WINDOW (dialog), status_icon_name[option - NUM_STATUS_TYPES - 1]);
image = gtk_image_new_from_icon_name (status_icon_name[option - NUM_STATUS_TYPES - 1], GTK_ICON_SIZE_MENU);
gtk_box_pack_start (GTK_BOX (hbox), image, false, false, 2);
diff --git a/lib/gui/dialpad.c b/lib/gui/dialpad.c
index f809b94..29df0f5 100644
--- a/lib/gui/dialpad.c
+++ b/lib/gui/dialpad.c
@@ -162,7 +162,7 @@ ekiga_dialpad_init (EkigaDialpad *dialpad)
gchar *text;
GtkWidget *alignment;
- box = gtk_hbox_new (FALSE, 2);
+ box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
label = gtk_label_new (keys_info[i].number);
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 1.0);
diff --git a/lib/gui/gm-cell-renderer-bitext.c b/lib/gui/gm-cell-renderer-bitext.c
index a182fd9..d176d39 100644
--- a/lib/gui/gm-cell-renderer-bitext.c
+++ b/lib/gui/gm-cell-renderer-bitext.c
@@ -120,11 +120,10 @@ gm_cell_renderer_bitext_update_text (GmCellRendererBitext *renderer,
/* overriden inherited functions, so we make sure the text is right before
* we compute size or draw */
-
static void
gm_cell_renderer_bitext_get_size (GtkCellRenderer *cell,
GtkWidget *widget,
- GdkRectangle *cell_area,
+ const GdkRectangle *cell_area,
gint *x_offset,
gint *y_offset,
gint *width,
@@ -149,8 +148,8 @@ static void
gm_cell_renderer_bitext_render (GtkCellRenderer *cell,
cairo_t *cr,
GtkWidget *widget,
- GdkRectangle *background_area,
- GdkRectangle *cell_area,
+ const GdkRectangle *background_area,
+ const GdkRectangle *cell_area,
GtkCellRendererState flags)
{
GmCellRendererBitext *renderer = NULL;
diff --git a/lib/gui/gmentrydialog.c b/lib/gui/gmentrydialog.c
index 4b0bb20..a0885dc 100644
--- a/lib/gui/gmentrydialog.c
+++ b/lib/gui/gmentrydialog.c
@@ -75,7 +75,7 @@ gm_entry_dialog_init (GmEntryDialog* self)
self->priv->label = gtk_label_new (NULL);
- hbox = gtk_hbox_new (FALSE, 6);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
gtk_box_pack_start (GTK_BOX (hbox), self->priv->label, FALSE, FALSE, 6);
gtk_box_pack_start (GTK_BOX (hbox), self->priv->field_entry, FALSE, FALSE, 6);
diff --git a/lib/gui/gmpreferences.c b/lib/gui/gmpreferences.c
index b988fe7..095ef08 100644
--- a/lib/gui/gmpreferences.c
+++ b/lib/gui/gmpreferences.c
@@ -134,7 +134,7 @@ gnome_prefs_entry_new (GtkWidget *table,
if (box) {
- hbox = gtk_hbox_new (FALSE, 0);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
g_value_init (&value, G_TYPE_INT);
g_object_get_property (G_OBJECT (table), "n-columns", &value);
cols = g_value_get_int (&value);
@@ -278,7 +278,7 @@ gnome_prefs_scale_new (GtkWidget *table,
writable = gm_conf_is_key_writable (conf_key);
- hbox = gtk_hbox_new (FALSE, 0);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
label = gtk_label_new_with_mnemonic (down_label_txt);
if (!writable)
@@ -295,7 +295,7 @@ gnome_prefs_scale_new (GtkWidget *table,
min, max, step,
2.0, 1.0);
- hscale = gtk_hscale_new (adj);
+ hscale = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, adj);
gtk_scale_set_draw_value (GTK_SCALE (hscale), FALSE);
gtk_widget_set_size_request (GTK_WIDGET (hscale), 150, -1);
if (!writable)
@@ -359,7 +359,7 @@ gnome_prefs_spin_new (GtkWidget *table,
if (box)
- hbox = gtk_hbox_new (FALSE, 0);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
label = gtk_label_new_with_mnemonic (label_txt);
if (!writable)
@@ -468,7 +468,7 @@ gnome_prefs_range_new (GtkWidget *table,
&&
gm_conf_is_key_writable (spin2_conf_key));
- hbox = gtk_hbox_new (FALSE, 0);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
label = gtk_label_new_with_mnemonic (label1_txt);
if (!writable)
gtk_widget_set_sensitive (GTK_WIDGET (label), FALSE);
@@ -916,7 +916,7 @@ gnome_prefs_subsection_new (GtkWidget *window,
if (window)
gpw = (GnomePrefsWindow *) g_object_get_data (G_OBJECT (window), "gpw");
- hbox = gtk_hbox_new (FALSE, 6);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
frame = gtk_frame_new (frame_name);
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE);
@@ -1017,7 +1017,7 @@ gnome_prefs_window_new (const gchar *logo_name)
/* The sections */
dialog_vbox = gtk_dialog_get_content_area (GTK_DIALOG (window));
- hbox = gtk_hbox_new (FALSE, 6);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 6);
gtk_container_add (GTK_CONTAINER (dialog_vbox), hbox);
@@ -1052,7 +1052,7 @@ gnome_prefs_window_new (const gchar *logo_name)
gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE, TRUE, 0);
gtk_widget_show (frame);
- vbox = gtk_vbox_new (FALSE, 0);
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_add (GTK_CONTAINER (frame), vbox);
gtk_widget_show (vbox);
@@ -1077,7 +1077,7 @@ gnome_prefs_window_new (const gchar *logo_name)
pango_attr_list_unref (attrs);
gtk_widget_show (gpw->section_label);
- hsep = gtk_hseparator_new ();
+ hsep = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
gtk_box_pack_start (GTK_BOX (vbox), hsep, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (vbox), gpw->notebook, TRUE, TRUE, 0);
@@ -1134,7 +1134,7 @@ gnome_prefs_window_subsection_new (GtkWidget *window,
if (!gpw || !section_name)
return NULL;
- container = gtk_vbox_new (FALSE, 4);
+ container = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
model = gtk_tree_view_get_model (GTK_TREE_VIEW (gpw->sections_tree_view));
gtk_tree_store_append (GTK_TREE_STORE (model), &child_iter, &gpw->iter);
gtk_tree_store_set (GTK_TREE_STORE (model), &child_iter, 0, section_name,
diff --git a/src/gui/assistant.cpp b/src/gui/assistant.cpp
index e985b2b..e346d20 100644
--- a/src/gui/assistant.cpp
+++ b/src/gui/assistant.cpp
@@ -121,14 +121,13 @@ create_page (EkigaAssistant *assistant,
{
GtkWidget *vbox;
- vbox = gtk_vbox_new (FALSE, 2);
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
gtk_assistant_append_page (GTK_ASSISTANT (assistant), vbox);
gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), vbox, title);
gtk_assistant_set_page_type (GTK_ASSISTANT (assistant), vbox, page_type);
- gtk_assistant_set_page_header_image (GTK_ASSISTANT (assistant), vbox, assistant->priv->icon);
if (page_type != GTK_ASSISTANT_PAGE_CONTENT)
gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), vbox, TRUE);
@@ -351,7 +350,6 @@ create_welcome_page (EkigaAssistant *assistant)
gtk_assistant_append_page (GTK_ASSISTANT (assistant), label);
gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), label, _("Welcome to Ekiga"));
gtk_assistant_set_page_type (GTK_ASSISTANT (assistant), label, GTK_ASSISTANT_PAGE_INTRO);
- gtk_assistant_set_page_header_image (GTK_ASSISTANT (assistant), label, assistant->priv->icon);
gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), label, TRUE);
assistant->priv->welcome_page = label;
@@ -452,7 +450,6 @@ create_info_page (EkigaAssistant *assistant)
gtk_assistant_append_page (GTK_ASSISTANT (assistant), label);
gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), label, _("Introduction to Accounts"));
gtk_assistant_set_page_type (GTK_ASSISTANT (assistant), label, GTK_ASSISTANT_PAGE_CONTENT);
- gtk_assistant_set_page_header_image (GTK_ASSISTANT (assistant), label, assistant->priv->icon);
gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), label, TRUE);
assistant->priv->info_page = label;
@@ -1523,9 +1520,6 @@ ekiga_assistant_init (EkigaAssistant *assistant)
gtk_container_set_border_width (GTK_CONTAINER (assistant), 12);
assistant->priv->last_active_page = 0;
- assistant->priv->icon = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
- PACKAGE_NAME, 48,
- (GtkIconLookupFlags) 0, NULL);
create_welcome_page (assistant);
create_personal_data_page (assistant);
@@ -1640,12 +1634,6 @@ ekiga_assistant_dispose (GObject *object)
gm_conf_notifier_remove (*iter);
assistant->priv->notifiers.clear (); // dispose might be called several times
- if (assistant->priv->icon) {
-
- g_object_unref (assistant->priv->icon);
- assistant->priv->icon = NULL;
- }
-
G_OBJECT_CLASS (ekiga_assistant_parent_class)->dispose (object);
}
diff --git a/src/gui/main_window.cpp b/src/gui/main_window.cpp
index c6323b3..14f43da 100644
--- a/src/gui/main_window.cpp
+++ b/src/gui/main_window.cpp
@@ -1461,7 +1461,7 @@ ekiga_main_window_init_dialpad (EkigaMainWindow *mw)
GtkWidget *label = NULL;
GtkWidget *vbox = NULL;
- vbox = gtk_vbox_new (false, 0);
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
dialpad = ekiga_dialpad_new (mw->priv->accel);
g_signal_connect (dialpad, "button-clicked",
G_CALLBACK (dialpad_button_clicked_cb), mw);
@@ -1505,7 +1505,7 @@ ekiga_main_window_init_gui (EkigaMainWindow *mw)
gtk_window_set_title (GTK_WINDOW (mw), _("Ekiga"));
- window_vbox = gtk_vbox_new (false, 0);
+ window_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_add (GTK_CONTAINER (mw), window_vbox);
gtk_widget_show_all (window_vbox);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
