[ekiga] Don't cast for g_signal_connect*
- From: Julien Puydt <jpuydt src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ekiga] Don't cast for g_signal_connect*
- Date: Sat, 6 Nov 2010 20:08:22 +0000 (UTC)
commit 1e7ec5df28780707952271d41caed677038324eb
Author: Snark <jpuydt gnome org>
Date: Sat Nov 6 21:10:06 2010 +0100
Don't cast for g_signal_connect*
It's useless, especially if the cast invokes a function everytime.
lib/engine/gui/gtk-core/codecsbox.cpp | 6 +-
lib/engine/gui/gtk-core/form-dialog-gtk.cpp | 10 ++--
lib/engine/gui/gtk-core/optional-buttons-gtk.cpp | 2 +-
lib/engine/gui/gtk-frontend/addressbook-window.cpp | 8 +-
lib/engine/gui/gtk-frontend/book-view-gtk.cpp | 4 +-
.../gui/gtk-frontend/call-history-view-gtk.cpp | 4 +-
lib/engine/gui/gtk-frontend/chat-area.cpp | 22 +++---
lib/engine/gui/gtk-frontend/multiple-chat-page.cpp | 2 +-
lib/engine/gui/gtk-frontend/roster-view-gtk.cpp | 4 +-
lib/engine/gui/gtk-frontend/simple-chat-page.cpp | 2 +-
lib/gui/gm-smiley-chooser-button.c | 24 ++++----
lib/gui/gmconnectbutton.c | 2 +-
lib/gui/gmmenuaddon.c | 12 ++--
lib/gui/gmpreferences.c | 22 +++---
lib/gui/gmwindow.c | 10 ++--
src/gui/accounts.cpp | 13 ++--
src/gui/assistant.cpp | 2 +-
src/gui/main_window.cpp | 66 ++++++++++----------
src/gui/preferences.cpp | 15 ++---
src/gui/statusmenu.cpp | 2 +-
20 files changed, 115 insertions(+), 117 deletions(-)
---
diff --git a/lib/engine/gui/gtk-core/codecsbox.cpp b/lib/engine/gui/gtk-core/codecsbox.cpp
index a57db45..cccdd7b 100644
--- a/lib/engine/gui/gtk-core/codecsbox.cpp
+++ b/lib/engine/gui/gtk-core/codecsbox.cpp
@@ -425,7 +425,7 @@ codecs_box_init (CodecsBox *self)
"activatable", COLUMN_CODEC_SELECTABLE);
gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (column), 25);
gtk_tree_view_append_column (GTK_TREE_VIEW (self->priv->codecs_list), column);
- g_signal_connect (G_OBJECT (renderer), "toggled",
+ g_signal_connect (renderer, "toggled",
G_CALLBACK (codec_toggled_cb),
(gpointer) self);
@@ -478,7 +478,7 @@ codecs_box_init (CodecsBox *self)
gtk_widget_set_tooltip_text (button, _("Move selected codec priority upwards"));
gtk_box_pack_start (GTK_BOX (buttons_vbox), button, FALSE, FALSE, 0);
g_object_set_data (G_OBJECT (button), "operation", (gpointer) "up");
- g_signal_connect (G_OBJECT (button), "clicked",
+ g_signal_connect (button, "clicked",
G_CALLBACK (codec_moved_cb),
(gpointer) self);
@@ -488,7 +488,7 @@ codecs_box_init (CodecsBox *self)
gtk_widget_set_tooltip_text (button, _("Move selected codec priority downwards"));
gtk_box_pack_start (GTK_BOX (buttons_vbox), button, FALSE, FALSE, 0);
g_object_set_data (G_OBJECT (button), "operation", (gpointer) "down");
- g_signal_connect (G_OBJECT (button), "clicked",
+ g_signal_connect (button, "clicked",
G_CALLBACK (codec_moved_cb),
(gpointer) self);
diff --git a/lib/engine/gui/gtk-core/form-dialog-gtk.cpp b/lib/engine/gui/gtk-core/form-dialog-gtk.cpp
index 379de45..ad3f7bf 100644
--- a/lib/engine/gui/gtk-core/form-dialog-gtk.cpp
+++ b/lib/engine/gui/gtk-core/form-dialog-gtk.cpp
@@ -754,7 +754,7 @@ FormDialog::link (const std::string _link,
gtk_button_set_relief (GTK_BUTTON (widget), GTK_RELIEF_NONE);
gtk_box_pack_start (GTK_BOX (preamble), widget, FALSE, FALSE, 0);
- g_signal_connect_data (G_OBJECT (widget), "clicked",
+ g_signal_connect_data (widget, "clicked",
G_CALLBACK (link_clicked_cb), (gpointer) g_strdup (_uri.c_str ()),
(GClosureNotify) g_free, (GConnectFlags) 0);
}
@@ -1118,7 +1118,7 @@ FormDialog::multiple_choice (const std::string name,
"active", MultipleChoiceSubmitter::COLUMN_ACTIVE,
NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view), column);
- g_signal_connect (G_OBJECT (renderer), "toggled",
+ g_signal_connect (renderer, "toggled",
G_CALLBACK (multiple_choice_choice_toggled_cb), list_store);
renderer = gtk_cell_renderer_text_new ();
@@ -1230,7 +1230,7 @@ FormDialog::editable_set (const std::string name,
"active", EditableSetSubmitter::COLUMN_ACTIVE,
NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view), column);
- g_signal_connect (G_OBJECT (renderer), "toggled",
+ g_signal_connect (renderer, "toggled",
G_CALLBACK (editable_set_choice_toggled_cb), list_store);
renderer = gtk_cell_renderer_text_new ();
@@ -1297,11 +1297,11 @@ FormDialog::editable_set (const std::string name,
gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 2);
gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 2);
- g_signal_connect (G_OBJECT (entry), "activate",
+ g_signal_connect (entry, "activate",
(GCallback) editable_set_add_value_activated_cb,
(gpointer) tree_view);
- g_signal_connect (G_OBJECT (button), "clicked",
+ g_signal_connect (button, "clicked",
(GCallback) editable_set_add_value_clicked_cb,
(gpointer) entry);
diff --git a/lib/engine/gui/gtk-core/optional-buttons-gtk.cpp b/lib/engine/gui/gtk-core/optional-buttons-gtk.cpp
index 266c906..538e62f 100644
--- a/lib/engine/gui/gtk-core/optional-buttons-gtk.cpp
+++ b/lib/engine/gui/gtk-core/optional-buttons-gtk.cpp
@@ -91,7 +91,7 @@ OptionalButtonsGtk::add_button (const std::string label,
struct OptionalButtonsGtkHelper* helper = new struct OptionalButtonsGtkHelper;
g_object_set_data_full (G_OBJECT (button), "ekiga-optional-buttons-gtk-helper",
(gpointer)helper,(GDestroyNotify)optional_buttons_gtk_helper_destroy);
- g_signal_connect (G_OBJECT (button), "clicked",
+ g_signal_connect (button, "clicked",
G_CALLBACK (on_optional_buttons_gtk_clicked), NULL);
}
diff --git a/lib/engine/gui/gtk-frontend/addressbook-window.cpp b/lib/engine/gui/gtk-frontend/addressbook-window.cpp
index 84c3006..7d5014f 100644
--- a/lib/engine/gui/gtk-frontend/addressbook-window.cpp
+++ b/lib/engine/gui/gtk-frontend/addressbook-window.cpp
@@ -246,7 +246,7 @@ on_core_updated (gpointer data)
item = gtk_image_menu_item_new_from_stock (GTK_STOCK_CLOSE, self->priv->accel);
gtk_menu_shell_append (GTK_MENU_SHELL (menu_builder.menu), item);
- g_signal_connect_swapped (G_OBJECT (item), "activate",
+ g_signal_connect_swapped (item, "activate",
G_CALLBACK (gtk_widget_hide),
(gpointer) self);
@@ -417,7 +417,7 @@ on_book_clicked (GtkWidget *tree_view,
gtk_menu_popup (GTK_MENU (menu_builder.menu),
NULL, NULL, NULL, NULL,
event->button, event->time);
- g_signal_connect (G_OBJECT (menu_builder.menu), "hide",
+ g_signal_connect (menu_builder.menu, "hide",
G_CALLBACK (g_object_unref),
(gpointer) menu_builder.menu);
}
@@ -749,9 +749,9 @@ addressbook_window_new (Ekiga::ContactCore &core)
self->priv->selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (self->priv->tree_view));
gtk_tree_selection_set_mode (GTK_TREE_SELECTION (self->priv->selection),
GTK_SELECTION_SINGLE);
- g_signal_connect (G_OBJECT (self->priv->selection), "changed",
+ g_signal_connect (self->priv->selection, "changed",
G_CALLBACK (on_book_selection_changed), self);
- g_signal_connect (G_OBJECT (self->priv->tree_view), "event-after",
+ g_signal_connect (self->priv->tree_view, "event-after",
G_CALLBACK (on_book_clicked), self);
/* The notebook containing the books */
diff --git a/lib/engine/gui/gtk-frontend/book-view-gtk.cpp b/lib/engine/gui/gtk-frontend/book-view-gtk.cpp
index fc90ada..5f4d533 100644
--- a/lib/engine/gui/gtk-frontend/book-view-gtk.cpp
+++ b/lib/engine/gui/gtk-frontend/book-view-gtk.cpp
@@ -345,7 +345,7 @@ on_contact_clicked (GtkWidget *tree_view,
gtk_widget_show_all (builder.menu);
gtk_menu_popup (GTK_MENU (builder.menu), NULL, NULL,
NULL, NULL, event->button, event->time);
- g_signal_connect (G_OBJECT (builder.menu), "hide",
+ g_signal_connect (builder.menu, "hide",
G_CALLBACK (g_object_unref),
(gpointer) builder.menu);
}
@@ -587,7 +587,7 @@ book_view_gtk_new (Ekiga::BookPtr book)
g_signal_connect (selection, "changed",
G_CALLBACK (on_selection_changed), result);
- g_signal_connect (G_OBJECT (result->priv->tree_view), "event-after",
+ g_signal_connect (result->priv->tree_view, "event-after",
G_CALLBACK (on_contact_clicked), result);
store = gtk_list_store_new (COLUMN_NUMBER,
diff --git a/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp b/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp
index 8a04ad0..65db944 100644
--- a/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp
+++ b/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp
@@ -373,9 +373,9 @@ call_history_view_gtk_new (boost::shared_ptr<History::Book> book)
/* react to user clicks */
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (self->priv->tree));
gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
- g_signal_connect (G_OBJECT (selection), "changed",
+ g_signal_connect (selection, "changed",
G_CALLBACK (on_selection_changed), self);
- g_signal_connect (G_OBJECT (self->priv->tree), "event-after",
+ g_signal_connect (self->priv->tree, "event-after",
G_CALLBACK (on_clicked), &(*book));
/* connect to the signals */
diff --git a/lib/engine/gui/gtk-frontend/chat-area.cpp b/lib/engine/gui/gtk-frontend/chat-area.cpp
index 27e4764..4e8c228 100644
--- a/lib/engine/gui/gtk-frontend/chat-area.cpp
+++ b/lib/engine/gui/gtk-frontend/chat-area.cpp
@@ -368,13 +368,13 @@ on_extlink_tag_event (GtkTextTag* tag,
g_strdup (link), g_free);
menu_item = gtk_menu_item_new_with_label (_("Open link in browser"));
- g_signal_connect_after (G_OBJECT (menu_item), "activate",
+ g_signal_connect_after (menu_item, "activate",
G_CALLBACK (on_open_link_activate), menu);
gtk_widget_show (menu_item);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
menu_item = gtk_menu_item_new_with_label (_("Copy link"));
- g_signal_connect_after (G_OBJECT (menu_item), "activate",
+ g_signal_connect_after (menu_item, "activate",
G_CALLBACK (on_copy_link_activate), menu);
gtk_widget_show (menu_item);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
@@ -769,7 +769,7 @@ chat_area_init (GTypeInstance* instance,
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
self->priv->text_view = gtk_text_view_new ();
- g_signal_connect (G_OBJECT (self->priv->text_view), "motion-notify-event",
+ g_signal_connect (self->priv->text_view, "motion-notify-event",
G_CALLBACK (on_motion_notify_event), NULL);
buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (self->priv->text_view));
@@ -807,7 +807,7 @@ chat_area_init (GTypeInstance* instance,
"foreground", "blue",
"underline", PANGO_UNDERLINE_SINGLE,
NULL);
- g_signal_connect (G_OBJECT (tag), "event",
+ g_signal_connect (tag, "event",
G_CALLBACK (on_extlink_tag_event), NULL);
{
GdkCursor* cursor = gdk_cursor_new (GDK_HAND2);
@@ -909,7 +909,7 @@ chat_area_init (GTypeInstance* instance,
gtk_button_set_image (GTK_BUTTON(smiley_chooser_button), smiley_button);
gtk_button_set_relief (GTK_BUTTON(smiley_chooser_button), GTK_RELIEF_NONE);
gtk_button_set_focus_on_click (GTK_BUTTON (smiley_chooser_button), FALSE);
- g_signal_connect (G_OBJECT (smiley_chooser_button), "smiley_selected",
+ g_signal_connect (smiley_chooser_button, "smiley_selected",
G_CALLBACK (on_smiley_selected), self);
gtk_box_pack_start (GTK_BOX (bbox), smiley_chooser_button,
FALSE, TRUE, 2);
@@ -922,7 +922,7 @@ chat_area_init (GTypeInstance* instance,
(gpointer) "</b>", NULL);
gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
gtk_button_set_focus_on_click (GTK_BUTTON (button), FALSE);
- g_signal_connect (G_OBJECT (button), "clicked",
+ g_signal_connect (button, "clicked",
G_CALLBACK (on_font_changed), self);
gtk_box_pack_start (GTK_BOX (bbox), button,
FALSE, TRUE, 2);
@@ -936,7 +936,7 @@ chat_area_init (GTypeInstance* instance,
(gpointer) "</i>", NULL);
gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
gtk_button_set_focus_on_click (GTK_BUTTON (button), FALSE);
- g_signal_connect (G_OBJECT (button), "clicked",
+ g_signal_connect (button, "clicked",
G_CALLBACK (on_font_changed), self);
gtk_box_pack_start (GTK_BOX (bbox), button,
FALSE, TRUE, 2);
@@ -950,7 +950,7 @@ chat_area_init (GTypeInstance* instance,
(gpointer) "</u>", NULL);
gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
gtk_button_set_focus_on_click (GTK_BUTTON (button), FALSE);
- g_signal_connect (G_OBJECT (button), "clicked",
+ g_signal_connect (button, "clicked",
G_CALLBACK (on_font_changed), self);
gtk_box_pack_start (GTK_BOX (bbox), button,
FALSE, TRUE, 2);
@@ -963,7 +963,7 @@ chat_area_init (GTypeInstance* instance,
gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (self->priv->message),
GTK_WRAP_WORD_CHAR);
gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (self->priv->message), true);
- g_signal_connect (GTK_OBJECT (self->priv->message), "key-press-event",
+ g_signal_connect (self->priv->message, "key-press-event",
G_CALLBACK (message_activated_cb), self);
gtk_box_pack_start (GTK_BOX (vbox), self->priv->message,
TRUE, TRUE, 2);
@@ -971,9 +971,9 @@ chat_area_init (GTypeInstance* instance,
gtk_widget_set_size_request (GTK_WIDGET (self->priv->message), 155, -1);
gtk_widget_show_all (vbox);
- g_signal_connect (G_OBJECT (self), "focus",
+ g_signal_connect (self, "focus",
G_CALLBACK (on_chat_area_focus), NULL);
- g_signal_connect (G_OBJECT (self), "grab-focus",
+ g_signal_connect (self, "grab-focus",
G_CALLBACK (on_chat_area_grab_focus), self->priv->message);
gtk_widget_grab_focus (self->priv->message);
}
diff --git a/lib/engine/gui/gtk-frontend/multiple-chat-page.cpp b/lib/engine/gui/gtk-frontend/multiple-chat-page.cpp
index 5cf64a3..285b61f 100644
--- a/lib/engine/gui/gtk-frontend/multiple-chat-page.cpp
+++ b/lib/engine/gui/gtk-frontend/multiple-chat-page.cpp
@@ -88,7 +88,7 @@ multiple_chat_page_init (GTypeInstance* instance,
self->priv = g_new (MultipleChatPagePrivate, 1);
self->priv->area = NULL;
- g_signal_connect (G_OBJECT (self), "grab-focus",
+ g_signal_connect (self, "grab-focus",
G_CALLBACK (on_page_grab_focus), NULL);
}
diff --git a/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp b/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp
index 20b31a2..e502513 100644
--- a/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp
+++ b/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp
@@ -1519,9 +1519,9 @@ roster_view_gtk_new (Ekiga::PresenceCore &core)
/* Callback when the selection has been changed */
selection = gtk_tree_view_get_selection (self->priv->tree_view);
gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
- g_signal_connect (G_OBJECT (selection), "changed",
+ g_signal_connect (selection, "changed",
G_CALLBACK (on_selection_changed), self);
- g_signal_connect (G_OBJECT (self->priv->tree_view), "event-after",
+ g_signal_connect (self->priv->tree_view, "event-after",
G_CALLBACK (on_view_event_after), self);
diff --git a/lib/engine/gui/gtk-frontend/simple-chat-page.cpp b/lib/engine/gui/gtk-frontend/simple-chat-page.cpp
index 09c04de..2406835 100644
--- a/lib/engine/gui/gtk-frontend/simple-chat-page.cpp
+++ b/lib/engine/gui/gtk-frontend/simple-chat-page.cpp
@@ -103,7 +103,7 @@ simple_chat_page_init (GTypeInstance* instance,
self->priv = g_new (SimpleChatPagePrivate, 1);
self->priv->area = NULL;
- g_signal_connect (G_OBJECT (self), "grab-focus",
+ g_signal_connect (self, "grab-focus",
G_CALLBACK (on_page_grab_focus), NULL);
}
diff --git a/lib/gui/gm-smiley-chooser-button.c b/lib/gui/gm-smiley-chooser-button.c
index 5d55898..54d0b52 100644
--- a/lib/gui/gm-smiley-chooser-button.c
+++ b/lib/gui/gm-smiley-chooser-button.c
@@ -201,7 +201,7 @@ gm_smiley_chooser_button_init (GTypeInstance* instance,
priv->frame = NULL;
priv->table = NULL;
- g_signal_connect (G_OBJECT (self), "toggled",
+ g_signal_connect (self, "toggled",
G_CALLBACK (on_smiley_chooser_button_toggled), NULL);
}
@@ -318,16 +318,16 @@ on_button_hierarchy_changed (GtkWidget* widget,
{
g_object_ref_sink (G_OBJECT (new_toplevel));
priv->toplevel_window_handler[HANDLER_CONFIGURE] =
- g_signal_connect (G_OBJECT (new_toplevel), "configure-event",
+ g_signal_connect (new_toplevel, "configure-event",
G_CALLBACK (on_toplevel_configure_event), self);
priv->toplevel_window_handler[HANDLER_SCREEN_CHANGED] =
- g_signal_connect (G_OBJECT (new_toplevel), "screen-changed",
+ g_signal_connect (new_toplevel, "screen-changed",
G_CALLBACK (on_toplevel_screen_changed), self);
priv->toplevel_window_handler[HANDLER_HIDE] =
- g_signal_connect (G_OBJECT (new_toplevel), "hide",
+ g_signal_connect (new_toplevel, "hide",
G_CALLBACK (on_toplevel_hide), self);
priv->toplevel_window_handler[HANDLER_DELETE_EVENT] =
- g_signal_connect (G_OBJECT (new_toplevel), "delete-event",
+ g_signal_connect (new_toplevel, "delete-event",
G_CALLBACK (on_toplevel_delete_event), self);
gtk_window_set_transient_for (GTK_WINDOW (priv->popup_window),
GTK_WINDOW (new_toplevel));
@@ -655,7 +655,7 @@ static void gm_smiley_chooser_build_view (GmSmileyChooserButton* self)
/* the popup window */
priv->popup_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
g_object_ref_sink (G_OBJECT (priv->popup_window));
- g_signal_connect (G_OBJECT (priv->popup_window), "button-press-event",
+ g_signal_connect (priv->popup_window, "button-press-event",
G_CALLBACK (on_popup_button_press_event), self);
// gtk_window_set_title (GTK_WINDOW (priv->popup_window), _("Smile!"));
gtk_window_set_type_hint (GTK_WINDOW (priv->popup_window),
@@ -720,7 +720,7 @@ static void gm_smiley_chooser_build_view (GmSmileyChooserButton* self)
"smiley_characters",
(gpointer) g_strdup (smiley_set[smiley]),
g_free);
- g_signal_connect (G_OBJECT (button), "clicked",
+ g_signal_connect (button, "clicked",
G_CALLBACK (on_smiley_image_clicked), self);
gtk_table_attach_defaults (GTK_TABLE (priv->table),
@@ -787,20 +787,20 @@ gm_smiley_chooser_button_new (void)
{
g_object_ref_sink (G_OBJECT (widget));
self->priv->toplevel_window_handler[HANDLER_CONFIGURE] =
- g_signal_connect (G_OBJECT (widget), "configure-event",
+ g_signal_connect (widget, "configure-event",
G_CALLBACK (on_toplevel_configure_event), self);
self->priv->toplevel_window_handler[HANDLER_SCREEN_CHANGED] =
- g_signal_connect (G_OBJECT (widget), "screen-changed",
+ g_signal_connect (widget, "screen-changed",
G_CALLBACK (on_toplevel_screen_changed), self);
self->priv->toplevel_window_handler[HANDLER_HIDE] =
- g_signal_connect (G_OBJECT (widget), "hide",
+ g_signal_connect (widget, "hide",
G_CALLBACK (on_toplevel_hide), self);
self->priv->toplevel_window_handler[HANDLER_DELETE_EVENT] =
- g_signal_connect (G_OBJECT (widget), "delete-event",
+ g_signal_connect (widget, "delete-event",
G_CALLBACK (on_toplevel_delete_event), self);
}
- g_signal_connect (G_OBJECT (self), "hierarchy-changed",
+ g_signal_connect (self, "hierarchy-changed",
G_CALLBACK (on_button_hierarchy_changed), self);
gm_smiley_chooser_button_set_smiley_set (self, gm_get_smileys());
diff --git a/lib/gui/gmconnectbutton.c b/lib/gui/gmconnectbutton.c
index a91bd23..bb2eafb 100644
--- a/lib/gui/gmconnectbutton.c
+++ b/lib/gui/gmconnectbutton.c
@@ -185,7 +185,7 @@ gm_connect_button_new (const char *pickup,
gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
cb->image = gtk_image_new_from_stock (pickup, size);
gtk_container_add (GTK_CONTAINER (button), cb->image);
- g_signal_connect (G_OBJECT (button), "clicked",
+ g_signal_connect (button, "clicked",
G_CALLBACK (gm_connect_button_clicked_cb), cb);
gtk_box_pack_start (GTK_BOX (cb), button, FALSE, FALSE, 0);
diff --git a/lib/gui/gmmenuaddon.c b/lib/gui/gmmenuaddon.c
index d2609e1..224abea 100644
--- a/lib/gui/gmmenuaddon.c
+++ b/lib/gui/gmmenuaddon.c
@@ -312,14 +312,14 @@ gtk_build_menu (GtkWidget *menubar,
if (menu [i].func) {
if (menu [i].clofunc) {
- g_signal_connect_data (G_OBJECT (menu [i].widget),
+ g_signal_connect_data (menu [i].widget,
"activate", menu [i].func,
menu [i].data,
(GClosureNotify) menu [i].clofunc,
(GConnectFlags) G_CONNECT_AFTER);
}
else {
- g_signal_connect (G_OBJECT (menu [i].widget),
+ g_signal_connect (menu [i].widget,
"activate", menu [i].func,
menu [i].data);
}
@@ -327,10 +327,10 @@ gtk_build_menu (GtkWidget *menubar,
g_object_set_data (G_OBJECT (menu [i].widget),
"statusbar", statusbar);
- g_signal_connect (G_OBJECT (menu [i].widget),
+ g_signal_connect (menu [i].widget,
"select", G_CALLBACK (menu_item_selected),
(gpointer) menu [i].tooltip);
- g_signal_connect (G_OBJECT (menu [i].widget),
+ g_signal_connect (menu [i].widget,
"deselect", G_CALLBACK (menu_item_selected),
NULL);
}
@@ -391,7 +391,7 @@ gtk_build_menu (GtkWidget *menubar,
menus_have_icons_changed_nt,
menubar);
- g_signal_connect (G_OBJECT (menubar), "destroy",
+ g_signal_connect (menubar, "destroy",
G_CALLBACK (menu_widget_destroyed), id);
}
@@ -409,7 +409,7 @@ gtk_build_popup_menu (GtkWidget *widget,
if (widget) {
- g_signal_connect (G_OBJECT (widget), "button_press_event",
+ g_signal_connect (widget, "button_press_event",
G_CALLBACK (popup_menu_callback),
(gpointer) popup_menu_widget);
diff --git a/lib/gui/gmpreferences.c b/lib/gui/gmpreferences.c
index d974a0a..49cbe29 100644
--- a/lib/gui/gmpreferences.c
+++ b/lib/gui/gmpreferences.c
@@ -171,11 +171,11 @@ gnome_prefs_entry_new (GtkWidget *table,
g_free (conf_string);
- g_signal_connect_after (G_OBJECT (entry), "focus-out-event",
+ g_signal_connect_after (entry, "focus-out-event",
G_CALLBACK (entry_focus_changed),
(gpointer)conf_key);
- g_signal_connect_after (G_OBJECT (entry), "activate",
+ g_signal_connect_after (entry, "activate",
G_CALLBACK (entry_activate_changed),
(gpointer)conf_key);
@@ -233,7 +233,7 @@ gnome_prefs_toggle_new (GtkWidget *table,
if (gpw && tooltip)
gtk_widget_set_tooltip_text (toggle, tooltip);
- g_signal_connect (G_OBJECT (toggle), "toggled",
+ g_signal_connect (toggle, "toggled",
G_CALLBACK (toggle_changed), (gpointer) conf_key);
gm_conf_notifier_add (conf_key, toggle_changed_nt, (gpointer) toggle);
@@ -310,7 +310,7 @@ gnome_prefs_scale_new (GtkWidget *table,
if (gpw && tooltip)
gtk_widget_set_tooltip_text (hscale, tooltip);
- g_signal_connect (G_OBJECT (adj), "value-changed",
+ g_signal_connect (adj, "value-changed",
G_CALLBACK (adjustment_changed),
(gpointer) conf_key);
@@ -408,7 +408,7 @@ gnome_prefs_spin_new (GtkWidget *table,
if (gpw && tooltip)
gtk_widget_set_tooltip_text (spin_button, tooltip);
- g_signal_connect (G_OBJECT (adj), "value-changed",
+ g_signal_connect (adj, "value-changed",
G_CALLBACK (adjustment_changed),
(gpointer) conf_key);
@@ -503,13 +503,13 @@ gnome_prefs_range_new (GtkWidget *table,
}
- g_signal_connect (G_OBJECT (adj1), "value-changed",
+ g_signal_connect (adj1, "value-changed",
G_CALLBACK (adjustment_changed),
(gpointer) spin1_conf_key);
gm_conf_notifier_add (spin1_conf_key, adjustment_changed_nt,
(gpointer) adj1);
- g_signal_connect (G_OBJECT (adj2), "value-changed",
+ g_signal_connect (adj2, "value-changed",
G_CALLBACK (adjustment_changed),
(gpointer) spin2_conf_key);
gm_conf_notifier_add (spin2_conf_key, adjustment_changed_nt,
@@ -595,8 +595,8 @@ gnome_prefs_int_option_menu_new (GtkWidget *table,
if (gpw && tooltip)
gtk_widget_set_tooltip_text (option_menu, tooltip);
- g_signal_connect (GTK_COMBO_BOX (option_menu),
- "changed", G_CALLBACK (int_option_menu_changed),
+ g_signal_connect (option_menu, "changed",
+ G_CALLBACK (int_option_menu_changed),
(gpointer) conf_key);
gm_conf_notifier_add (conf_key, int_option_menu_changed_nt,
(gpointer) option_menu);
@@ -707,8 +707,8 @@ gnome_prefs_string_option_menu_new (GtkWidget *table,
if (gpw && tooltip)
gtk_widget_set_tooltip_text (option_menu, tooltip);
- g_signal_connect (GTK_COMBO_BOX (option_menu),
- "changed", G_CALLBACK (string_option_menu_changed),
+ g_signal_connect (option_menu, "changed",
+ G_CALLBACK (string_option_menu_changed),
(gpointer) conf_key);
gm_conf_notifier_add (conf_key, string_option_menu_changed_nt,
(gpointer) option_menu);
diff --git a/lib/gui/gmwindow.c b/lib/gui/gmwindow.c
index 169c332..78b4a56 100644
--- a/lib/gui/gmwindow.c
+++ b/lib/gui/gmwindow.c
@@ -241,16 +241,16 @@ gm_window_init (GTypeInstance *instance,
gtk_accel_group_connect (self->priv->accel, GDK_Escape, (GdkModifierType) 0, GTK_ACCEL_LOCKED,
g_cclosure_new_swap (G_CALLBACK (gtk_widget_hide), (gpointer) self, NULL));
- g_signal_connect (G_OBJECT (self), "delete_event",
+ g_signal_connect (self, "delete_event",
G_CALLBACK (gm_window_delete_event), NULL);
- g_signal_connect (G_OBJECT (self), "show",
+ g_signal_connect (self, "show",
G_CALLBACK (window_show_cb), self);
- g_signal_connect (G_OBJECT (self), "hide",
+ g_signal_connect (self, "hide",
G_CALLBACK (window_hide_cb), self);
- g_signal_connect (G_OBJECT (self), "configure-event",
+ g_signal_connect (self, "configure-event",
G_CALLBACK (gm_window_configure_event), self);
}
@@ -664,7 +664,7 @@ gm_window_hide_on_delete (GtkWidget* window)
{
g_return_if_fail (GTK_IS_OBJECT (window));
- g_signal_connect (GTK_OBJECT (window), "delete-event",
+ g_signal_connect (window, "delete-event",
G_CALLBACK (delete_event_cb), NULL);
}
diff --git a/src/gui/accounts.cpp b/src/gui/accounts.cpp
index 91366f9..5b6ab26 100644
--- a/src/gui/accounts.cpp
+++ b/src/gui/accounts.cpp
@@ -193,7 +193,7 @@ populate_menu (GtkWidget *window)
}
item = gtk_image_menu_item_new_from_stock (GTK_STOCK_CLOSE, aw->accel);
gtk_menu_shell_append (GTK_MENU_SHELL (builder.menu), item);
- g_signal_connect_swapped (G_OBJECT (item), "activate",
+ g_signal_connect_swapped (item, "activate",
G_CALLBACK (gtk_widget_hide),
(gpointer) window);
@@ -257,7 +257,7 @@ account_clicked_cb (G_GNUC_UNUSED GtkWidget *w,
gtk_widget_show_all (builder.menu);
gtk_menu_popup (GTK_MENU (builder.menu), NULL, NULL,
NULL, NULL, event->button, event->time);
- g_signal_connect (G_OBJECT (builder.menu), "hide",
+ g_signal_connect (builder.menu, "hide",
G_CALLBACK (g_object_unref),
(gpointer) builder.menu);
}
@@ -599,7 +599,7 @@ gm_accounts_window_new (Ekiga::ServiceCore &core)
gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_item), menu);
item = gtk_image_menu_item_new_from_stock (GTK_STOCK_HELP, NULL);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
- g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (help_callback), NULL);
+ g_signal_connect (item, "activate", G_CALLBACK (help_callback), NULL);
/* The accounts list store */
list_store = gtk_list_store_new (COLUMN_ACCOUNT_NUMBER,
@@ -625,7 +625,7 @@ gm_accounts_window_new (Ekiga::ServiceCore &core)
COLUMN_ACCOUNT_IS_ENABLED,
NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW (aw->accounts_list), column);
- g_signal_connect (G_OBJECT (renderer), "toggled",
+ g_signal_connect (renderer, "toggled",
G_CALLBACK (account_toggled_cb),
(gpointer)window);
@@ -647,7 +647,7 @@ gm_accounts_window_new (Ekiga::ServiceCore &core)
gtk_tree_view_column_set_sort_column_id (column, i);
}
- g_signal_connect (G_OBJECT (aw->accounts_list), "event_after",
+ g_signal_connect (aw->accounts_list, "event_after",
G_CALLBACK (account_clicked_cb), window);
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (aw->accounts_list));
@@ -700,8 +700,7 @@ gm_accounts_window_new (Ekiga::ServiceCore &core)
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), event_box, TRUE, TRUE, 0);
/* Generic signals */
- g_signal_connect_swapped (GTK_OBJECT (window),
- "response",
+ g_signal_connect_swapped (window, "response",
G_CALLBACK (gm_window_hide),
(gpointer) window);
diff --git a/src/gui/assistant.cpp b/src/gui/assistant.cpp
index 4a41292..634905c 100644
--- a/src/gui/assistant.cpp
+++ b/src/gui/assistant.cpp
@@ -391,7 +391,7 @@ create_personal_data_page (EkigaAssistant *assistant)
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0);
- g_signal_connect (G_OBJECT (assistant->priv->name), "changed",
+ g_signal_connect (assistant->priv->name, "changed",
G_CALLBACK (name_changed_cb), assistant);
assistant->priv->personal_data_page = vbox;
diff --git a/src/gui/main_window.cpp b/src/gui/main_window.cpp
index ffa864b..f99dfff 100644
--- a/src/gui/main_window.cpp
+++ b/src/gui/main_window.cpp
@@ -910,7 +910,7 @@ static bool on_handle_errors (std::string error,
gtk_window_set_title (GTK_WINDOW (dialog), _("Error"));
gtk_label_set_markup (GTK_LABEL (GTK_MESSAGE_DIALOG (dialog)->label), error.c_str ());
- g_signal_connect_swapped (GTK_OBJECT (dialog), "response",
+ g_signal_connect_swapped (dialog, "response",
G_CALLBACK (gtk_widget_destroy),
GTK_OBJECT (dialog));
@@ -1598,7 +1598,7 @@ gm_mw_video_settings_window_new (EkigaMainWindow *mw)
gtk_widget_set_tooltip_text (hscale_brightness, _("Adjust brightness"));
- g_signal_connect (G_OBJECT (mw->priv->adj_brightness), "value-changed",
+ g_signal_connect (mw->priv->adj_brightness, "value-changed",
G_CALLBACK (video_settings_changed_cb),
(gpointer) mw);
@@ -1619,7 +1619,7 @@ gm_mw_video_settings_window_new (EkigaMainWindow *mw)
gtk_widget_set_tooltip_text (hscale_whiteness, _("Adjust whiteness"));
- g_signal_connect (G_OBJECT (mw->priv->adj_whiteness), "value-changed",
+ g_signal_connect (mw->priv->adj_whiteness, "value-changed",
G_CALLBACK (video_settings_changed_cb),
(gpointer) mw);
@@ -1640,7 +1640,7 @@ gm_mw_video_settings_window_new (EkigaMainWindow *mw)
gtk_widget_set_tooltip_text (hscale_colour, _("Adjust color"));
- g_signal_connect (G_OBJECT (mw->priv->adj_colour), "value-changed",
+ g_signal_connect (mw->priv->adj_colour, "value-changed",
G_CALLBACK (video_settings_changed_cb),
(gpointer) mw);
@@ -1661,7 +1661,7 @@ gm_mw_video_settings_window_new (EkigaMainWindow *mw)
gtk_widget_set_tooltip_text (hscale_contrast, _("Adjust contrast"));
- g_signal_connect (G_OBJECT (mw->priv->adj_contrast), "value-changed",
+ g_signal_connect (mw->priv->adj_contrast, "value-changed",
G_CALLBACK (video_settings_changed_cb),
(gpointer) mw);
@@ -1778,24 +1778,24 @@ gm_mw_audio_settings_window_new (EkigaMainWindow *mw)
gtk_widget_show_all (mw->priv->audio_input_volume_frame);
gtk_widget_set_sensitive (GTK_WIDGET (mw->priv->audio_input_volume_frame), FALSE);
- g_signal_connect (G_OBJECT (mw->priv->adj_output_volume), "value-changed",
+ g_signal_connect (mw->priv->adj_output_volume, "value-changed",
G_CALLBACK (audio_volume_changed_cb), mw);
- g_signal_connect (G_OBJECT (mw->priv->adj_input_volume), "value-changed",
+ g_signal_connect (mw->priv->adj_input_volume, "value-changed",
G_CALLBACK (audio_volume_changed_cb), mw);
/* That's an usual GtkWindow, connect it to the signals */
- g_signal_connect_swapped (GTK_OBJECT (window),
+ g_signal_connect_swapped (window,
"response",
G_CALLBACK (gm_window_hide),
(gpointer) window);
gm_window_hide_on_delete (window);
- g_signal_connect (G_OBJECT (window), "show",
+ g_signal_connect (window, "show",
G_CALLBACK (audio_volume_window_shown_cb), mw);
- g_signal_connect (G_OBJECT (window), "hide",
+ g_signal_connect (window, "hide",
G_CALLBACK (audio_volume_window_hidden_cb), mw);
return window;
@@ -2383,7 +2383,7 @@ ekiga_main_window_update_logo_have_window (EkigaMainWindow *mw)
{
g_return_if_fail (EKIGA_IS_MAIN_WINDOW (mw));
- g_object_set (G_OBJECT (mw->priv->main_video_image),
+ g_object_set (mw->priv->main_video_image,
"icon-name", GM_ICON_LOGO,
"pixel-size", 72,
NULL);
@@ -2428,12 +2428,12 @@ ekiga_main_window_set_call_hold (EkigaMainWindow *mw,
ekiga_main_window_set_channel_pause (mw, FALSE, TRUE);
}
- g_signal_handlers_block_by_func (G_OBJECT (mw->priv->hold_button),
+ g_signal_handlers_block_by_func (mw->priv->hold_button,
(gpointer) hold_current_call_cb,
mw);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (mw->priv->hold_button),
is_on_hold);
- g_signal_handlers_unblock_by_func (G_OBJECT (mw->priv->hold_button),
+ g_signal_handlers_unblock_by_func (mw->priv->hold_button,
(gpointer) hold_current_call_cb,
mw);
}
@@ -2781,9 +2781,9 @@ ekiga_main_window_incoming_call_dialog_show (EkigaMainWindow *mw,
gtk_widget_show_all (incoming_call_popup);
- g_signal_connect (G_OBJECT (incoming_call_popup), "delete_event",
+ g_signal_connect (incoming_call_popup, "delete_event",
G_CALLBACK (gtk_widget_hide_on_delete), NULL);
- g_signal_connect (G_OBJECT (incoming_call_popup), "response",
+ g_signal_connect (incoming_call_popup, "response",
G_CALLBACK (incoming_call_response_cb), mw);
call->established.connect (boost::bind (&on_incoming_call_gone_cb,
@@ -3122,22 +3122,22 @@ ekiga_main_window_add_device_dialog_show (EkigaMainWindow *mw,
gtk_widget_show_all (add_device_popup);
-// g_signal_connect (G_OBJECT (add_device_popup), "delete_event",
+// g_signal_connect (add_device_popup, "delete_event",
// G_CALLBACK (gtk_widget_hide_on_delete), NULL);
-// g_signal_connect (G_OBJECT (add_device_popup), "response",
+// g_signal_connect (add_device_popup, "response",
// G_CALLBACK (add_device_response_cb), &device);
deviceStruct* device_struct = g_new(deviceStruct, 1);
snprintf (device_struct->name, sizeof (device_struct->name), "%s", (device.GetString()).c_str());
device_struct->deviceType = device_type;
- g_signal_connect_data (G_OBJECT (add_device_popup), "delete_event",
+ g_signal_connect_data (add_device_popup, "delete_event",
G_CALLBACK (gtk_widget_hide_on_delete),
(gpointer) device_struct,
(GClosureNotify) g_free,
(GConnectFlags) 0);
- g_signal_connect_data (G_OBJECT (add_device_popup), "response",
+ g_signal_connect_data (add_device_popup, "response",
G_CALLBACK (add_device_response_cb),
(gpointer) device_struct,
(GClosureNotify) g_free,
@@ -3394,9 +3394,9 @@ ekiga_main_window_init_uri_toolbar (EkigaMainWindow *mw)
gtk_editable_set_position (GTK_EDITABLE (mw->priv->entry), -1);
- g_signal_connect (G_OBJECT (mw->priv->entry), "changed",
+ g_signal_connect (mw->priv->entry, "changed",
G_CALLBACK (url_changed_cb), mw);
- g_signal_connect (G_OBJECT (mw->priv->entry), "activate",
+ g_signal_connect (mw->priv->entry, "activate",
G_CALLBACK (place_call_cb), mw);
gtk_toolbar_insert (GTK_TOOLBAR (mw->priv->main_toolbar), item, 0);
@@ -3415,7 +3415,7 @@ ekiga_main_window_init_uri_toolbar (EkigaMainWindow *mw)
gtk_toolbar_insert (GTK_TOOLBAR (mw->priv->main_toolbar), item, -1);
- g_signal_connect (G_OBJECT (mw->priv->connect_button), "clicked",
+ g_signal_connect (mw->priv->connect_button, "clicked",
G_CALLBACK (toggle_call_cb),
mw);
@@ -3459,7 +3459,7 @@ ekiga_main_window_init_contact_list (EkigaMainWindow *mw)
label = gtk_label_new (_("Contacts"));
mw->priv->roster_view = roster_view_gtk_new (*presence_core);
mw->priv->roster_view_page_number = gtk_notebook_append_page (GTK_NOTEBOOK (mw->priv->main_notebook), mw->priv->roster_view, label);
- g_signal_connect (G_OBJECT (mw->priv->roster_view), "selection-changed",
+ g_signal_connect (mw->priv->roster_view, "selection-changed",
G_CALLBACK (on_roster_selection_changed), mw);
}
@@ -3472,7 +3472,7 @@ ekiga_main_window_init_dialpad (EkigaMainWindow *mw)
GtkWidget *label = NULL;
dialpad = ekiga_dialpad_new (mw->priv->accel);
- g_signal_connect (G_OBJECT (dialpad), "button-clicked",
+ g_signal_connect (dialpad, "button-clicked",
G_CALLBACK (dialpad_button_clicked_cb), mw);
alignment = gtk_alignment_new (0.5, 0.5, 0.2, 0.2);
@@ -3481,7 +3481,7 @@ ekiga_main_window_init_dialpad (EkigaMainWindow *mw)
label = gtk_label_new (_("Dialpad"));
mw->priv->dialpad_page_number = gtk_notebook_append_page (GTK_NOTEBOOK (mw->priv->main_notebook), alignment, label);
- g_signal_connect (G_OBJECT (mw), "key-press-event",
+ g_signal_connect (mw, "key-press-event",
G_CALLBACK (key_press_event_cb), mw);
}
@@ -3498,7 +3498,7 @@ ekiga_main_window_init_history (EkigaMainWindow *mw)
label = gtk_label_new (_("Call history"));
mw->priv->call_history_page_number = gtk_notebook_append_page (GTK_NOTEBOOK (mw->priv->main_notebook), mw->priv->call_history_view, label);
- g_signal_connect (G_OBJECT (mw->priv->call_history_view), "selection-changed",
+ g_signal_connect (mw->priv->call_history_view, "selection-changed",
G_CALLBACK (on_history_selection_changed), mw);
}
@@ -3605,7 +3605,7 @@ ekiga_main_window_init_call_panel (EkigaMainWindow *mw)
GTK_TOOL_ITEM (item), -1);
gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (item),
_("Change the volume of your soundcard"));
- g_signal_connect (G_OBJECT (mw->priv->audio_settings_button), "clicked",
+ g_signal_connect (mw->priv->audio_settings_button, "clicked",
G_CALLBACK (show_window_cb),
(gpointer) mw->priv->audio_settings_window);
}
@@ -3627,7 +3627,7 @@ ekiga_main_window_init_call_panel (EkigaMainWindow *mw)
gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (item),
_("Change the color settings of your video device"));
- g_signal_connect (G_OBJECT (mw->priv->video_settings_button), "clicked",
+ g_signal_connect (mw->priv->video_settings_button, "clicked",
G_CALLBACK (show_window_cb),
(gpointer) mw->priv->video_settings_window);
@@ -3649,7 +3649,7 @@ ekiga_main_window_init_call_panel (EkigaMainWindow *mw)
gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (item),
_("Display images from your camera device"));
- g_signal_connect (G_OBJECT (mw->priv->preview_button), "toggled",
+ g_signal_connect (mw->priv->preview_button, "toggled",
G_CALLBACK (toolbar_toggle_button_changed_cb),
(gpointer) VIDEO_DEVICES_KEY "enable_preview");
@@ -3670,7 +3670,7 @@ ekiga_main_window_init_call_panel (EkigaMainWindow *mw)
_("Hold the current call"));
gtk_widget_set_sensitive (GTK_WIDGET (mw->priv->hold_button), FALSE);
- g_signal_connect (G_OBJECT (mw->priv->hold_button), "clicked",
+ g_signal_connect (mw->priv->hold_button, "clicked",
G_CALLBACK (hold_current_call_cb), mw);
alignment = gtk_alignment_new (0.0, 0.0, 1.0, 0.0);
@@ -3757,12 +3757,12 @@ ekiga_main_window_init_gui (EkigaMainWindow *mw)
FALSE, FALSE, 0);
gtk_widget_show_all (mw->priv->statusbar_ebox);
- g_signal_connect (G_OBJECT (mw->priv->statusbar_ebox), "button-press-event",
+ g_signal_connect (mw->priv->statusbar_ebox, "button-press-event",
G_CALLBACK (statusbar_clicked_cb), mw);
gtk_widget_realize (GTK_WIDGET (mw));
ekiga_main_window_update_logo_have_window (mw);
- g_signal_connect_after (G_OBJECT (mw->priv->main_notebook), "switch-page",
+ g_signal_connect_after (mw->priv->main_notebook, "switch-page",
G_CALLBACK (panel_section_changed_cb),
mw);
@@ -4146,7 +4146,7 @@ gm_main_window_new (Ekiga::ServiceCore & core)
/* Track status icon embed changes */
/* FIXME: move this to the status icon code */
status_icon = GTK_STATUS_ICON (GnomeMeeting::Process ()->GetStatusicon ());
- g_signal_connect (G_OBJECT (status_icon), "notify::embedded",
+ g_signal_connect (status_icon, "notify::embedded",
G_CALLBACK (on_status_icon_embedding_change), NULL);
return window;
diff --git a/src/gui/preferences.cpp b/src/gui/preferences.cpp
index 3de56c2..88a6122 100644
--- a/src/gui/preferences.cpp
+++ b/src/gui/preferences.cpp
@@ -437,7 +437,7 @@ gm_pw_add_update_button (G_GNUC_UNUSED GtkWidget *prefs_window,
gtk_box_pack_start (GTK_BOX (box), alignment, TRUE, TRUE, 0);
- g_signal_connect (G_OBJECT (button), "clicked",
+ g_signal_connect (button, "clicked",
G_CALLBACK (func),
(gpointer) data);
@@ -599,7 +599,7 @@ gm_pw_init_sound_events_page (GtkWidget *prefs_window,
NULL);
gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (column), 25);
gtk_tree_view_append_column (GTK_TREE_VIEW (pw->sound_events_list), column);
- g_signal_connect (G_OBJECT (renderer), "toggled",
+ g_signal_connect (renderer, "toggled",
G_CALLBACK (sound_event_toggled_cb),
GTK_TREE_MODEL (list_store));
@@ -637,22 +637,22 @@ gm_pw_init_sound_events_page (GtkWidget *prefs_window,
gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER (pw->fsbutton),
selector_hbox);
- g_signal_connect (G_OBJECT (selector_playbutton), "clicked",
+ g_signal_connect (selector_playbutton, "clicked",
G_CALLBACK (audioev_filename_browse_play_cb),
(gpointer) prefs_window);
- g_signal_connect (G_OBJECT (pw->fsbutton), "selection-changed",
+ g_signal_connect (pw->fsbutton, "selection-changed",
G_CALLBACK (audioev_filename_browse_cb),
(gpointer) prefs_window);
- g_signal_connect (G_OBJECT (selection), "changed",
+ g_signal_connect (selection, "changed",
G_CALLBACK (sound_event_clicked_cb),
(gpointer) pw->fsbutton);
button = gtk_button_new_with_label (_("Play"));
gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 2);
- g_signal_connect (G_OBJECT (button), "clicked",
+ g_signal_connect (button, "clicked",
G_CALLBACK (sound_event_play_cb),
(gpointer) prefs_window);
@@ -1406,8 +1406,7 @@ gm_prefs_window_new (Ekiga::ServiceCore *core)
/* That's an usual GtkWindow, connect it to the signals */
- g_signal_connect_swapped (GTK_OBJECT (window),
- "response",
+ g_signal_connect_swapped (window, "response",
G_CALLBACK (gm_window_hide),
(gpointer) window);
diff --git a/src/gui/statusmenu.cpp b/src/gui/statusmenu.cpp
index 5221d58..f50c931 100644
--- a/src/gui/statusmenu.cpp
+++ b/src/gui/statusmenu.cpp
@@ -852,7 +852,7 @@ status_menu_new (Ekiga::ServiceCore & core)
gtk_container_set_border_width (GTK_CONTAINER (self), 0);
status_menu_set_option (self, self->priv->personal_details->get_presence (), self->priv->personal_details->get_status ());
- g_signal_connect (G_OBJECT (self), "changed",
+ g_signal_connect (self, "changed",
G_CALLBACK (status_menu_option_changed), self);
gm_conf_notifier_add (PERSONAL_DATA_KEY "online_custom_status",
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
