GNOME.org
 

[libegg/spread-table-dnd: 8/78] Fix use of deprecated gdk_drawable_get_size().

commit fed7845a6722f9cf5129fe86b4a9232b2e71b312
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri Mar 11 11:44:25 2011 +0100

    Fix use of deprecated gdk_drawable_get_size().

 doc/tmpl/egg-background-monitor.sgml               |    6 +
 doc/tmpl/egg-cell-renderer-text.sgml               |    7 ++
 doc/tmpl/eggcellrendererkeys.sgml                  |    8 ++
 doc/tmpl/eggcellrendererpopup.sgml                 |    7 ++
 doc/tmpl/eggcolumnchooserdialog.sgml               |    6 +
 doc/tmpl/eggcolumnmodel.sgml                       |    7 ++
 doc/tmpl/eggintl.sgml                              |    6 +
 doc/tmpl/eggmarshalers.sgml                        |    6 +
 doc/tmpl/eggnodestate.sgml                         |    6 +
 doc/tmpl/eggreorder.sgml                           |    6 +
 doc/tmpl/eggsidebar.sgml                           |    7 ++
 doc/tmpl/eggsidebarbutton.sgml                     |    6 +
 doc/tmpl/eggtreemodelfilter.sgml                   |    6 +
 doc/tmpl/eggtreemultidnd.sgml                      |    6 +
 doc/tmpl/eggtreeviewstate.sgml                     |    6 +
 doc/tmpl/libegg-unused.sgml                        |  115 ++++++++++++++++++++
 libegg/background-monitor/egg-background-monitor.c |   40 ++++----
 17 files changed, 231 insertions(+), 20 deletions(-)
---
diff --git a/doc/tmpl/egg-background-monitor.sgml b/doc/tmpl/egg-background-monitor.sgml
index 2bed044..5cdf49f 100644
--- a/doc/tmpl/egg-background-monitor.sgml
+++ b/doc/tmpl/egg-background-monitor.sgml
@@ -14,6 +14,12 @@ egg-background-monitor
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT EggBackgroundMonitorClass ##### -->
 <para>
 
diff --git a/doc/tmpl/egg-cell-renderer-text.sgml b/doc/tmpl/egg-cell-renderer-text.sgml
index a5bfbd0..cbf4ca2 100644
--- a/doc/tmpl/egg-cell-renderer-text.sgml
+++ b/doc/tmpl/egg-cell-renderer-text.sgml
@@ -14,11 +14,18 @@ EggCellRendererText
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION egg_cell_renderer_text_new ##### -->
 <para>
 
 </para>
 
+ void: 
 @Returns: 
 
 
diff --git a/doc/tmpl/eggcellrendererkeys.sgml b/doc/tmpl/eggcellrendererkeys.sgml
index 5f0e06b..97f68a8 100644
--- a/doc/tmpl/eggcellrendererkeys.sgml
+++ b/doc/tmpl/eggcellrendererkeys.sgml
@@ -14,11 +14,18 @@ EggCellRendererKeys
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION egg_cell_renderer_keys_new ##### -->
 <para>
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -29,6 +36,7 @@ EggCellRendererKeys
 
 @keys: 
 @keyval: 
+ keycode: 
 @mask: 
 
 
diff --git a/doc/tmpl/eggcellrendererpopup.sgml b/doc/tmpl/eggcellrendererpopup.sgml
index 11a0c5f..fb731cb 100644
--- a/doc/tmpl/eggcellrendererpopup.sgml
+++ b/doc/tmpl/eggcellrendererpopup.sgml
@@ -14,11 +14,18 @@ EggCellRendererPopup
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION egg_cell_renderer_popup_new ##### -->
 <para>
 
 </para>
 
+ void: 
 @Returns: 
 
 
diff --git a/doc/tmpl/eggcolumnchooserdialog.sgml b/doc/tmpl/eggcolumnchooserdialog.sgml
index 23f0864..c9bf972 100644
--- a/doc/tmpl/eggcolumnchooserdialog.sgml
+++ b/doc/tmpl/eggcolumnchooserdialog.sgml
@@ -14,6 +14,12 @@ EggColumnChooserDialog
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION egg_column_chooser_dialog_new ##### -->
 <para>
 
diff --git a/doc/tmpl/eggcolumnmodel.sgml b/doc/tmpl/eggcolumnmodel.sgml
index 62f3483..9c4d804 100644
--- a/doc/tmpl/eggcolumnmodel.sgml
+++ b/doc/tmpl/eggcolumnmodel.sgml
@@ -14,11 +14,18 @@ EggColumnModel
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION egg_column_model_get_type ##### -->
 <para>
 
 </para>
 
+ void: 
 @Returns: 
 
 
diff --git a/doc/tmpl/eggintl.sgml b/doc/tmpl/eggintl.sgml
index 7473bfe..c1f4a1d 100644
--- a/doc/tmpl/eggintl.sgml
+++ b/doc/tmpl/eggintl.sgml
@@ -14,6 +14,12 @@ eggintl
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### MACRO _ ##### -->
 <para>
 
diff --git a/doc/tmpl/eggmarshalers.sgml b/doc/tmpl/eggmarshalers.sgml
index d69efc7..25898ed 100644
--- a/doc/tmpl/eggmarshalers.sgml
+++ b/doc/tmpl/eggmarshalers.sgml
@@ -14,3 +14,9 @@ eggmarshalers
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
diff --git a/doc/tmpl/eggnodestate.sgml b/doc/tmpl/eggnodestate.sgml
index e62e655..12f7075 100644
--- a/doc/tmpl/eggnodestate.sgml
+++ b/doc/tmpl/eggnodestate.sgml
@@ -14,3 +14,9 @@ eggnodestate
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
diff --git a/doc/tmpl/eggreorder.sgml b/doc/tmpl/eggreorder.sgml
index ccb7d60..5c2d0a8 100644
--- a/doc/tmpl/eggreorder.sgml
+++ b/doc/tmpl/eggreorder.sgml
@@ -14,3 +14,9 @@ eggreorder
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
diff --git a/doc/tmpl/eggsidebar.sgml b/doc/tmpl/eggsidebar.sgml
index 83ec8c5..1663706 100644
--- a/doc/tmpl/eggsidebar.sgml
+++ b/doc/tmpl/eggsidebar.sgml
@@ -14,6 +14,12 @@ EggSidebar
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT EggSidebarPriv ##### -->
 <para>
 
@@ -33,6 +39,7 @@ EggSidebar
 
 </para>
 
+ void: 
 @Returns: 
 
 
diff --git a/doc/tmpl/eggsidebarbutton.sgml b/doc/tmpl/eggsidebarbutton.sgml
index 5d4992f..80a453f 100644
--- a/doc/tmpl/eggsidebarbutton.sgml
+++ b/doc/tmpl/eggsidebarbutton.sgml
@@ -14,6 +14,12 @@ eggsidebarbutton
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION egg_sidebar_button_new ##### -->
 <para>
 
diff --git a/doc/tmpl/eggtreemodelfilter.sgml b/doc/tmpl/eggtreemodelfilter.sgml
index 3f6c26e..4a43fb2 100644
--- a/doc/tmpl/eggtreemodelfilter.sgml
+++ b/doc/tmpl/eggtreemodelfilter.sgml
@@ -14,6 +14,12 @@ EggTreeModelFilter
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION egg_tree_model_filter_clear_cache ##### -->
 <para>
 
diff --git a/doc/tmpl/eggtreemultidnd.sgml b/doc/tmpl/eggtreemultidnd.sgml
index 5045414..1281ed8 100644
--- a/doc/tmpl/eggtreemultidnd.sgml
+++ b/doc/tmpl/eggtreemultidnd.sgml
@@ -14,6 +14,12 @@ eggtreemultidnd
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT EggTreeMultiDragSource ##### -->
 <para>
 
diff --git a/doc/tmpl/eggtreeviewstate.sgml b/doc/tmpl/eggtreeviewstate.sgml
index 77acdaa..a8f05ca 100644
--- a/doc/tmpl/eggtreeviewstate.sgml
+++ b/doc/tmpl/eggtreeviewstate.sgml
@@ -14,6 +14,12 @@ eggtreeviewstate
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION egg_tree_view_state_apply_from_string ##### -->
 <para>
 
diff --git a/doc/tmpl/libegg-unused.sgml b/doc/tmpl/libegg-unused.sgml
index 1e59081..b08e22b 100644
--- a/doc/tmpl/libegg-unused.sgml
+++ b/doc/tmpl/libegg-unused.sgml
@@ -18,6 +18,46 @@
 EggCellRendererPixbuf
 
 
+<!-- ##### SECTION ./tmpl/eggtrayicon.sgml:Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/eggtrayicon.sgml:See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/eggtrayicon.sgml:Short_Description ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/eggtrayicon.sgml:Title ##### -->
+EggTrayIcon
+
+
+<!-- ##### SECTION ./tmpl/eggtraymanager.sgml:Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/eggtraymanager.sgml:See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/eggtraymanager.sgml:Short_Description ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/eggtraymanager.sgml:Title ##### -->
+EggTrayManager
+
+
 <!-- ##### SECTION ./tmpl/gtktreemodelfilter.sgml:Long_Description ##### -->
 <para>
 
@@ -352,6 +392,12 @@ GtkTreeModelFilter
 
 @eggtoggleaction: the object which received the signal.
 
+<!-- ##### STRUCT EggTrayManagerChild ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### ARG EggTreeModelFilter:child-model ##### -->
 <para>
 
@@ -614,6 +660,50 @@ GtkTreeModelFilter
 @filename: 
 @Returns: 
 
+<!-- ##### FUNCTION egg_tray_icon_cancel_message ##### -->
+<para>
+
+</para>
+
+ icon: 
+ id: 
+
+<!-- ##### FUNCTION egg_tray_icon_new ##### -->
+<para>
+
+</para>
+
+ name: 
+ Returns: 
+
+<!-- ##### FUNCTION egg_tray_icon_new_for_screen ##### -->
+<para>
+
+</para>
+
+ screen: 
+ name: 
+ Returns: 
+
+<!-- ##### FUNCTION egg_tray_icon_send_message ##### -->
+<para>
+
+</para>
+
+ icon: 
+ timeout: 
+ message: 
+ len: 
+ Returns: 
+
+<!-- ##### FUNCTION egg_tray_manager_check_running ##### -->
+<para>
+
+</para>
+
+ screen: 
+ Returns: 
+
 <!-- ##### FUNCTION egg_tray_manager_check_running_default_screen ##### -->
 <para>
 
@@ -621,6 +711,15 @@ GtkTreeModelFilter
 
 @Returns: 
 
+<!-- ##### FUNCTION egg_tray_manager_get_child_title ##### -->
+<para>
+
+</para>
+
+ manager: 
+ child: 
+ Returns: 
+
 <!-- ##### FUNCTION egg_tray_manager_manage ##### -->
 <para>
 
@@ -629,6 +728,22 @@ GtkTreeModelFilter
 @manager: 
 @Returns: 
 
+<!-- ##### FUNCTION egg_tray_manager_manage_screen ##### -->
+<para>
+
+</para>
+
+ manager: 
+ screen: 
+ Returns: 
+
+<!-- ##### FUNCTION egg_tray_manager_new ##### -->
+<para>
+
+</para>
+
+ Returns: 
+
 <!-- ##### FUNCTION egg_tree_store_reorder ##### -->
 <para>
 
diff --git a/libegg/background-monitor/egg-background-monitor.c b/libegg/background-monitor/egg-background-monitor.c
index 7a7e025..b994f07 100644
--- a/libegg/background-monitor/egg-background-monitor.c
+++ b/libegg/background-monitor/egg-background-monitor.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * (c) Copyright 2002 Ian McKellar <yakk yakk net>
  */
 
@@ -53,7 +53,7 @@ egg_background_monitor_finalize (GObject *object)
 	g_object_unref (G_OBJECT (monitor->gdkpixmap));
 	g_object_unref (G_OBJECT (monitor->gdkpixbuf));
 
-	gdk_window_remove_filter(monitor->gdkwindow, 
+	gdk_window_remove_filter(monitor->gdkwindow,
 			egg_background_monitor_xevent_filter, monitor);
 }
 
@@ -62,11 +62,11 @@ egg_background_monitor_class_init (EggBackgroundMonitorClass *klass)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-	signals[CHANGED] = 
+	signals[CHANGED] =
 		g_signal_new ("changed",
 				G_OBJECT_CLASS_TYPE (object_class),
 				G_SIGNAL_RUN_LAST,
-				G_STRUCT_OFFSET (EggBackgroundMonitorClass, 
+				G_STRUCT_OFFSET (EggBackgroundMonitorClass,
 					changed),
 				NULL, NULL,
 				g_cclosure_marshal_VOID__VOID,
@@ -87,10 +87,10 @@ egg_background_monitor_init (EggBackgroundMonitor *monitor)
 	monitor->gdkpixmap = NULL;
 	monitor->gdkpixbuf = NULL;
 
-	gdk_window_add_filter(monitor->gdkwindow, 
+	gdk_window_add_filter(monitor->gdkwindow,
 			egg_background_monitor_xevent_filter, monitor);
 
-	gdk_window_set_events(monitor->gdkwindow, 
+	gdk_window_set_events(monitor->gdkwindow,
 			gdk_window_get_events(monitor->gdkwindow) |
 			GDK_PROPERTY_CHANGE_MASK);
 }
@@ -121,7 +121,7 @@ EggBackgroundMonitor *
 egg_background_monitor_new () {
 	EggBackgroundMonitor *p;
 
-	p = (EggBackgroundMonitor *)g_object_new (egg_background_monitor_get_type (), 
+	p = (EggBackgroundMonitor *)g_object_new (egg_background_monitor_get_type (),
 			NULL);
 	return p;
 }
@@ -161,11 +161,11 @@ egg_background_monitor_setup_pixmap (EggBackgroundMonitor *monitor)
 
 	prop_data.data = NULL;
 
-	gdk_property_get(monitor->gdkwindow, monitor->gdkatom, 0, 0, 10, 
+	gdk_property_get(monitor->gdkwindow, monitor->gdkatom, 0, 0, 10,
 			FALSE, &prop_type, NULL, NULL, &prop_data.data);
 
-	if ((prop_type == GDK_TARGET_PIXMAP) 
-			&& (prop_data.pixmap != NULL) 
+	if ((prop_type == GDK_TARGET_PIXMAP)
+			&& (prop_data.pixmap != NULL)
 			&& (prop_data.pixmap[0] != 0)) {
 		monitor->gdkpixmap = gdk_pixmap_foreign_new(prop_data.pixmap[0]);
 
@@ -176,7 +176,7 @@ egg_background_monitor_setup_pixmap (EggBackgroundMonitor *monitor)
 
 }
 
-static void 
+static void
 egg_background_monitor_setup_pixbuf (EggBackgroundMonitor *monitor)
 {
 	GdkColormap *colormap = NULL;
@@ -189,19 +189,19 @@ egg_background_monitor_setup_pixbuf (EggBackgroundMonitor *monitor)
 		return;
 	}
 
-	gdk_drawable_get_size (GDK_DRAWABLE (monitor->gdkpixmap), 
+	gdk_pixmap_get_size (monitor->gdkpixmap,
 			&pwidth, &pheight);
 
-	gdk_drawable_get_size (GDK_DRAWABLE (monitor->gdkwindow),
-			&rwidth, &rheight);
+  rwidth = gdk_window_get_width(monitor->gdkwindow);
+  rheight = gdk_window_get_height(monitor->gdkwindow);
 
 	monitor->width = MIN(pwidth, rwidth);
 	monitor->height = MIN(pheight, rheight);
 
 	colormap = gdk_drawable_get_colormap(monitor->gdkwindow);
 
-	monitor->gdkpixbuf = gdk_pixbuf_get_from_drawable(NULL, 
-			monitor->gdkpixmap, colormap, 0, 0, 0, 0, 
+	monitor->gdkpixbuf = gdk_pixbuf_get_from_drawable(NULL,
+			monitor->gdkpixmap, colormap, 0, 0, 0, 0,
 			monitor->width, monitor->height);
 
 }
@@ -232,7 +232,7 @@ egg_background_monitor_get_region (EggBackgroundMonitor *monitor, int x, int y,
 				height); /* who cares */
 	}
 
-	pixbuf = gdk_pixbuf_new_subpixbuf (monitor->gdkpixbuf, subx, suby, 
+	pixbuf = gdk_pixbuf_new_subpixbuf (monitor->gdkpixbuf, subx, suby,
 			subwidth, subheight);
 
 	/* FIXME: don't handle regions off the top or left edge */
@@ -258,8 +258,8 @@ egg_background_monitor_get_widget_background (EggBackgroundMonitor *monitor,
 	/* FIXME: do we need deskrelative_origin? screw E IMHO */
 	gdk_window_get_origin (widget->window, &x, &y);
 
-	return egg_background_monitor_get_region (monitor, x+widget->allocation.x, 
-			y+widget->allocation.y, 
-			widget->allocation.width, 
+	return egg_background_monitor_get_region (monitor, x+widget->allocation.x,
+			y+widget->allocation.y,
+			widget->allocation.width,
 			widget->allocation.height);
 }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]