summaryrefslogtreecommitdiffstats
path: root/o3d
diff options
context:
space:
mode:
authorerg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-10 17:47:41 +0000
committererg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-10 17:47:41 +0000
commite5a2acec061119fab8f5b0a05e79702ae03670dc (patch)
tree24cfd3e9144b9116a060187e5525d21e74363117 /o3d
parent4f0872bb0ff3bfaca9f765c64a6d76598daf4ed4 (diff)
downloadchromium_src-e5a2acec061119fab8f5b0a05e79702ae03670dc.zip
chromium_src-e5a2acec061119fab8f5b0a05e79702ae03670dc.tar.gz
chromium_src-e5a2acec061119fab8f5b0a05e79702ae03670dc.tar.bz2
Remove redundant casts in g_signal_connect() throughout all gtk code we have.
BUG=none TEST=none Review URL: http://codereview.chromium.org/600033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38629 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d')
-rw-r--r--o3d/plugin/linux/main_linux.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/o3d/plugin/linux/main_linux.cc b/o3d/plugin/linux/main_linux.cc
index 2b3e89e..3f0f2c5 100644
--- a/o3d/plugin/linux/main_linux.cc
+++ b/o3d/plugin/linux/main_linux.cc
@@ -780,7 +780,7 @@ NPError NPP_SetWindow(NPP instance, NPWindow *window) {
// calling NPP_Destroy. We handle this by hiding our X window instead of
// destroying it. Without this, future OpenGL calls can raise a
// GLXBadDrawable error and kill the browser process.
- g_signal_connect(G_OBJECT(obj->gtk_container_), "delete-event",
+ g_signal_connect(obj->gtk_container_, "delete-event",
G_CALLBACK(gtk_widget_hide_on_delete), NULL);
gtk_widget_set_double_buffered(obj->gtk_container_, FALSE);
if (!obj->fullscreen()) {
@@ -863,7 +863,7 @@ void PluginObject::SetGtkEventSource(GtkWidget *widget) {
GDK_EXPOSURE_MASK |
GDK_ENTER_NOTIFY_MASK |
GDK_LEAVE_NOTIFY_MASK);
- event_handler_id_ = g_signal_connect(G_OBJECT(gtk_event_source_), "event",
+ event_handler_id_ = g_signal_connect(gtk_event_source_, "event",
G_CALLBACK(GtkEventCallback), this);
}
}
@@ -945,9 +945,9 @@ bool PluginObject::RequestFullscreenDisplay() {
// size, but let's do it anyway. It could still be relevant for some window
// managers.
gtk_window_fullscreen(window);
- g_signal_connect(G_OBJECT(window), "configure-event",
+ g_signal_connect(window, "configure-event",
G_CALLBACK(GtkConfigureEventCallback), this);
- g_signal_connect(G_OBJECT(window), "delete-event",
+ g_signal_connect(window, "delete-event",
G_CALLBACK(GtkDeleteEventCallback), this);
gtk_fullscreen_container_ = widget;
gtk_widget_show(widget);