callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Drop use of gail_return_if_fail

Browse Source
This commit is contained in:
Matthias Clasen 2011-06-28 22:48:37 -04:00
parent 3ab623e391
commit fecefc6cdf
2 changed files with 5 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gtk/a11y/gailmenuitem.c
View File

@ -22,7 +22,6 @@
#include <gdk/gdkkeysyms.h> #include <gdk/gdkkeysyms.h>
#include "gailmenuitem.h" #include "gailmenuitem.h"
#include "gailsubmenuitem.h" #include "gailsubmenuitem.h"
#include <libgail-util/gailmisc.h>
#define KEYBINDING_SEPARATOR ";" #define KEYBINDING_SEPARATOR ";"

55
gtk/a11y/gailwindow.c
View File

@ -25,7 +25,6 @@
#include "gailwindow.h" #include "gailwindow.h"
#include "gailtoplevel.h" #include "gailtoplevel.h"
#include "gail-private-macros.h"
enum { enum {
ACTIVATE, ACTIVATE,
@ -191,9 +190,8 @@ gail_window_real_initialize (AtkObject *obj,
/* /*
* A GailWindow can be created for a GtkHandleBox or a GtkWindow * A GailWindow can be created for a GtkHandleBox or a GtkWindow
*/ */
if (!GTK_IS_WINDOW (widget) && if (!GTK_IS_WINDOW (widget) && !GTK_IS_HANDLE_BOX (widget))
!GTK_IS_HANDLE_BOX (widget)) return;
gail_return_if_fail (FALSE);
ATK_OBJECT_CLASS (gail_window_parent_class)->initialize (obj, data); ATK_OBJECT_CLASS (gail_window_parent_class)->initialize (obj, data);
@ -277,13 +275,8 @@ gail_window_get_name (AtkObject *accessible)
GtkWidget* widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (accessible)); GtkWidget* widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (accessible));
if (widget == NULL) if (widget == NULL)
/*
* State is defunct
*/
return NULL; return NULL;
gail_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
if (GTK_IS_WINDOW (widget)) if (GTK_IS_WINDOW (widget))
{ {
GtkWindow *window = GTK_WINDOW (widget); GtkWindow *window = GTK_WINDOW (widget);
@ -345,13 +338,8 @@ gail_window_get_index_in_parent (AtkObject *accessible)
gint index = -1; gint index = -1;
if (widget == NULL) if (widget == NULL)
/*
* State is defunct
*/
return -1; return -1;
gail_return_val_if_fail (GTK_IS_WIDGET (widget), -1);
index = ATK_OBJECT_CLASS (gail_window_parent_class)->get_index_in_parent (accessible); index = ATK_OBJECT_CLASS (gail_window_parent_class)->get_index_in_parent (accessible);
if (index != -1) if (index != -1)
return index; return index;
@ -399,13 +387,8 @@ gail_window_ref_relation_set (AtkObject *obj)
AtkRelation* relation; AtkRelation* relation;
GtkWidget *current_widget; GtkWidget *current_widget;
gail_return_val_if_fail (GAIL_IS_WIDGET (obj), NULL);
widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (obj)); widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (obj));
if (widget == NULL) if (widget == NULL)
/*
* State is defunct
*/
return NULL; return NULL;
relation_set = ATK_OBJECT_CLASS (gail_window_parent_class)->ref_relation_set (obj); relation_set = ATK_OBJECT_CLASS (gail_window_parent_class)->ref_relation_set (obj);
@ -558,13 +541,8 @@ gail_window_get_extents (AtkComponent *component,
gint x_toplevel, y_toplevel; gint x_toplevel, y_toplevel;
if (widget == NULL) if (widget == NULL)
/*
* State is defunct
*/
return; return;
gail_return_if_fail (GTK_IS_WINDOW (widget));
if (!gtk_widget_is_toplevel (widget)) if (!gtk_widget_is_toplevel (widget))
{ {
AtkComponentIface *parent_iface; AtkComponentIface *parent_iface;
@ -605,13 +583,8 @@ gail_window_get_size (AtkComponent *component,
GdkRectangle rect; GdkRectangle rect;
if (widget == NULL) if (widget == NULL)
/*
* State is defunct
*/
return; return;
gail_return_if_fail (GTK_IS_WINDOW (widget));
if (!gtk_widget_is_toplevel (widget)) if (!gtk_widget_is_toplevel (widget))
{ {
AtkComponentIface *parent_iface; AtkComponentIface *parent_iface;
@ -934,9 +907,7 @@ init_gail_screen (GdkScreen *screen,
static GailScreenInfo * static GailScreenInfo *
get_screen_info (GdkScreen *screen) get_screen_info (GdkScreen *screen)
{ {
int screen_n; gint screen_n;
gail_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
screen_n = gdk_screen_get_number (screen); screen_n = gdk_screen_get_number (screen);
@ -964,11 +935,10 @@ get_window_zorder (GdkWindow *window)
int zorder; int zorder;
int w_desktop; int w_desktop;
gail_return_val_if_fail (GDK_IS_WINDOW (window), -1);
info = get_screen_info (gdk_window_get_screen (window)); info = get_screen_info (gdk_window_get_screen (window));
gail_return_val_if_fail (info->stacked_windows != NULL, -1); if (info->stacked_windows == NULL)
return -1;
xid = GDK_WINDOW_XID (window); xid = GDK_WINDOW_XID (window);
@ -1007,13 +977,8 @@ gail_window_get_mdi_zorder (AtkComponent *component)
GtkWidget *widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (component)); GtkWidget *widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (component));
if (widget == NULL) if (widget == NULL)
/*
* State is defunct
*/
return -1; return -1;
gail_return_val_if_fail (GTK_IS_WINDOW (widget), -1);
return get_window_zorder (gtk_widget_get_window (widget)); return get_window_zorder (gtk_widget_get_window (widget));
} }
@ -1025,13 +990,8 @@ gail_window_get_mdi_zorder (AtkComponent *component)
GtkWidget *widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (component)); GtkWidget *widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (component));
if (widget == NULL) if (widget == NULL)
/*
* State is defunct
*/
return -1; return -1;
gail_return_val_if_fail (GTK_IS_WINDOW (widget), -1);
return 0; /* Punt, FIXME */ return 0; /* Punt, FIXME */
} }
@ -1043,13 +1003,8 @@ gail_window_get_mdi_zorder (AtkComponent *component)
GtkWidget *widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (component)); GtkWidget *widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (component));
if (widget == NULL) if (widget == NULL)
/*
* State is defunct
*/
return -1; return -1;
gail_return_val_if_fail (GTK_IS_WINDOW (widget), -1);
return 0; /* Punt, FIXME */ return 0; /* Punt, FIXME */
} }