Replace SIGNAL_EMIT_BY_NAME(), SIGNAL_EMIT_OBJECT() and

SIGNAL_EMIT_STOP_BY_NAME() macros with their actual function names.


svn path=/trunk/; revision=24890
This commit is contained in:
Stephen Fisher 2008-04-11 05:03:33 +00:00
parent b010ad9411
commit 16e54385b3
4 changed files with 5 additions and 11 deletions

View File

@ -55,12 +55,6 @@ g_object_get_data(G_OBJECT(widget), key)
#define WIDGET_SET_SIZE(widget, width, height) \
gtk_widget_set_size_request(GTK_WIDGET(widget), width, height)
#define SIGNAL_EMIT_BY_NAME g_signal_emit_by_name
#define SIGNAL_EMIT_OBJECT(object) G_OBJECT(object)
#define SIGNAL_EMIT_STOP_BY_NAME(widget, name) \
g_signal_stop_emission_by_name(G_OBJECT(widget), name)
#define ITEM_FACTORY_ENTRY(path, accelerator, callback, action, type, data) \
{path, accelerator, GTK_MENU_FUNC(callback), action, type, data}

View File

@ -689,7 +689,7 @@ filter_dlg_dclick(GtkWidget *filter_l, gpointer main_w_arg, gpointer activate)
/*
* Yes - do so.
*/
SIGNAL_EMIT_BY_NAME(SIGNAL_EMIT_OBJECT(parent_filter_te), "activate", NULL);
g_signal_emit_by_name(G_OBJECT(parent_filter_te), "activate", NULL);
}
}
}
@ -781,7 +781,7 @@ filter_apply(GtkWidget *main_w, gboolean destroy)
* to destroy it.
*/
if (construct_args->activate_on_ok) {
SIGNAL_EMIT_BY_NAME(SIGNAL_EMIT_OBJECT(parent_filter_te), "activate", NULL);
g_signal_emit_by_name(G_OBJECT(parent_filter_te), "activate", NULL);
}
}
}

View File

@ -2353,7 +2353,7 @@ popup_menu_handler(GtkWidget *widget, GdkEvent *event, gpointer data)
gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL,
event_button->button,
event_button->time);
SIGNAL_EMIT_STOP_BY_NAME(widget, "button_press_event");
g_signal_stop_emission_by_name(widget, "button_press_event");
return TRUE;
}
}

View File

@ -697,14 +697,14 @@ packet_list_thaw(void)
void
packet_list_select_row(gint row)
{
SIGNAL_EMIT_BY_NAME(SIGNAL_EMIT_OBJECT(packet_list), "select_row", row);
g_signal_emit_by_name(G_OBJECT(packet_list), "select_row", row);
}
static void
packet_list_next_prev(gboolean next)
{
GtkWidget *focus = gtk_window_get_focus(GTK_WINDOW(top_level));
SIGNAL_EMIT_BY_NAME(SIGNAL_EMIT_OBJECT(packet_list), "scroll_vertical",
g_signal_emit_by_name(G_OBJECT(packet_list), "scroll_vertical",
next ? GTK_SCROLL_STEP_FORWARD : GTK_SCROLL_STEP_BACKWARD, 0.0);
/* Set the focus back where it was */
if (focus)