Replace SIGNAL_EMIT_BY_NAME(), SIGNAL_EMIT_OBJECT() and

SIGNAL_EMIT_STOP_BY_NAME() macros with their actual function names.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24890 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/gtk/compat_macros.h b/gtk/compat_macros.h
index 695b15c5d69ab751eb6864a2e15bd2f3544b2ee3..6bf1c5f728090542484fbd508939684b97aebc51 100644 (file)
--- a/gtk/compat_macros.h
+++ b/gtk/compat_macros.h
@@ -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}
 

diff --git a/gtk/filter_dlg.c b/gtk/filter_dlg.c
index 65edbcab512e429cdbfb3d2ab67ea5524b316b1b..95485ca625305ad93f22d80550788b0a90e08a0c 100644 (file)
--- a/gtk/filter_dlg.c
+++ b/gtk/filter_dlg.c
@@ -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);
                }
        }
 }

diff --git a/gtk/menu.c b/gtk/menu.c
index 0b72a31c7db34f98ce066417ac06d922f481208e..3d306f94957178feeb7aa13e4408a7f1317faca2 100644 (file)
--- a/gtk/menu.c
+++ b/gtk/menu.c
@@ -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;
         }
     }

diff --git a/gtk/packet_list.c b/gtk/packet_list.c
index 8ddcb54eb2a9fa66b338c3d179ea4ebd0b659078..0d674ff7df968b94a3c851f5912dc3fd3203fac3 100644 (file)
--- a/gtk/packet_list.c
+++ b/gtk/packet_list.c
@@ -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)