Commit 5cf48664 authored by Mark McLoughlin's avatar Mark McLoughlin Committed by Mark McLoughlin

#ifdef out debugging messages.

2001-11-26  Mark McLoughlin  <mark@skynet.ie>

        * menu-fentry.c: (fr_fill_dir), (fr_read_dir): #ifdef out
          debugging messages.

        * quick-desktop-reader.c: (quick_desktop_item_load_uri): ditto.

        * menu.c: (fake_mapped_fake), (show_item_menu),
        (create_menu_at_fr): revert g_signal_connect_object changes
        back to gtk_signal_connect_object. Giving out warnings and not
        sure how to fix it.
        Use g_signal_handlers_disconnect_matched instead of
        g_signal_disconnect_by_func which doesn't exist.

        * panel-widget.c: (panel_widget_applet_event):
        reverse order of params in g_signal_lookup calls.

        * panel.c: (basep_pos_connect_signals): revert
         g_signal_connect_object changes back to
         gtk_signal_connect_object. Giving out warnings and not sure
         how to fix it.
parent 159357ff
2001-11-26 Mark McLoughlin <mark@skynet.ie>
* doc/reference/panel-applet/Makefile.am: fixup.
2001-11-26 Mark McLoughlin <mark@skynet.ie>
* AUTHORS, BUGS, NEWS, README, DEPENDS, HACKING: try to bring
......
2001-11-26 Mark McLoughlin <mark@skynet.ie>
* doc/reference/panel-applet/Makefile.am: fixup.
2001-11-26 Mark McLoughlin <mark@skynet.ie>
* AUTHORS, BUGS, NEWS, README, DEPENDS, HACKING: try to bring
......
......@@ -3,13 +3,16 @@
# The name of the module, e.g. 'glib'.
DOC_MODULE=panel-applet
# Where the html is to be installed
HTML_DIR=$(datadir)/gtk-doc/html
# The top-level SGML file. Change it if you want.
DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
# The directory containing the source code. Relative to $(srcdir).
# gtk-doc will search all .c & .h files beneath here for inline comments
# documenting functions and macros.
DOC_SOURCE_DIR=../../
DOC_SOURCE_DIR=../../../panel
# Extra options to supply to gtkdoc-scan.
SCAN_OPTIONS=
......@@ -97,11 +100,12 @@ extra_files =
# contains GtkObjects/GObjects and you want to document signals and properties.
GTKDOC_CFLAGS = \
$(PANEL_CFLAGS) \
-I$(srcdir)/../../
-I$(srcdir)/../../../panel \
-I$(top_builddir)/panel
GTKDOC_LIBS = \
$(PANEL_LIBS) \
../../libpanel-applet-2.la
../../../panel/libpanel-applet-2.la
GTKDOC_CC=$(LIBTOOL) --mode=compile $(CC)
GTKDOC_LD=$(LIBTOOL) --mode=link $(CC)
......
<!-- ##### MACRO PANEL_APPLET_BONOBO_FACTORY ##### -->
<para>
Defines a 'main' routine for the applet factory.
</para>
@iid: The bonobo-activation iid of the factory.
@name: The applet ID string.
@version: The applet version string.
@callback: The factory callback.
@data: he factory user data pointer.
<!-- ##### MACRO PANEL_APPLET_ORIENT_DOWN ##### -->
<para>
A panel at the bottom of the screen.
</para>
<!-- ##### MACRO PANEL_APPLET_ORIENT_LEFT ##### -->
<para>
A panel at the left-hand side of the screen.
</para>
<!-- ##### MACRO PANEL_APPLET_ORIENT_RIGHT ##### -->
<para>
A panel at the right-hand side of the screen.
</para>
<!-- ##### MACRO PANEL_APPLET_ORIENT_UP ##### -->
<para>
A panel at the top of the screen.
</para>
<!-- ##### STRUCT PanelApplet ##### -->
<para>
The #PanelApplet struct contains private data only.
</para>
<!-- ##### ENUM PanelAppletBackgroundType ##### -->
<para>
The #PanelAppletOrient enumerated type specifies the type of background
of a panel.
</para>
@PANEL_NO_BACKGROUND: The panel has no backround, the default is used.
@PANEL_COLOR_BACKGROUND: The panel has a color, i.e rgb value,
background.
@PANEL_PIXMAP_BACKGOUND: The panel a pixmap bacground.
<!-- ##### STRUCT PanelAppletClass ##### -->
<para>
</para>
<!-- ##### TYPEDEF PanelAppletOrient ##### -->
<para>
The #PanelAppletOrient type specifies the orientation of a panel.
</para>
<!-- ##### STRUCT PanelAppletPrivate ##### -->
<para>
......@@ -18,3 +78,63 @@
@applet:
@widget:
<!-- ##### FUNCTION panel_applet_factory_main ##### -->
<para>
</para>
@argc:
@argv:
@iid:
@name:
@version:
@callback:
@data:
@Returns:
<!-- ##### FUNCTION panel_applet_get_control ##### -->
<para>
</para>
@applet:
@Returns:
<!-- ##### FUNCTION panel_applet_get_popup_component ##### -->
<para>
</para>
@applet:
@Returns:
<!-- ##### FUNCTION panel_applet_new ##### -->
<para>
</para>
@widget:
@Returns:
<!-- ##### FUNCTION panel_applet_setup_menu ##### -->
<para>
</para>
@applet:
@xml:
@verb_list:
@user_data:
<!-- ##### FUNCTION panel_applet_setup_menu_from_file ##### -->
<para>
</para>
@applet:
@opt_datadir:
@file:
@opt_app_name:
@verb_list:
@user_data:
......@@ -21,137 +21,6 @@ the cross process UI emmbedding required by applets possible.
</para>
<!-- ##### STRUCT PanelApplet ##### -->
<para>
The #PanelApplet struct contains private data only.
</para>
<!-- ##### TYPEDEF PanelAppletOrient ##### -->
<para>
The #PanelAppletOrient type specifies the orientation of a panel.
</para>
<!-- ##### MACRO PANEL_APPLET_ORIENT_UP ##### -->
<para>
A panel at the top of the screen.
</para>
<!-- ##### MACRO PANEL_APPLET_ORIENT_DOWN ##### -->
<para>
A panel at the bottom of the screen.
</para>
<!-- ##### MACRO PANEL_APPLET_ORIENT_LEFT ##### -->
<para>
A panel at the left-hand side of the screen.
</para>
<!-- ##### MACRO PANEL_APPLET_ORIENT_RIGHT ##### -->
<para>
A panel at the right-hand side of the screen.
</para>
<!-- ##### ENUM PanelAppletBackgroundType ##### -->
<para>
The #PanelAppletOrient enumerated type specifies the type of background
of a panel.
</para>
@PANEL_NO_BACKGROUND: The panel has no backround, the default is used.
@PANEL_COLOR_BACKGROUND: The panel has a color, i.e rgb value,
background.
@PANEL_PIXMAP_BACKGOUND: The panel a pixmap bacground.
<!-- ##### FUNCTION panel_applet_new ##### -->
<para>
</para>
@widget:
@Returns:
<!-- ##### FUNCTION panel_applet_get_control ##### -->
<para>
</para>
@applet:
@Returns:
<!-- ##### FUNCTION panel_applet_get_popup_component ##### -->
<para>
</para>
@applet:
@Returns:
<!-- ##### FUNCTION panel_applet_setup_menu ##### -->
<para>
</para>
@applet:
@xml:
@verb_list:
@user_data:
<!-- ##### FUNCTION panel_applet_setup_menu_from_file ##### -->
<para>
</para>
@applet:
@opt_datadir:
@file:
@opt_app_name:
@verb_list:
@user_data:
<!-- ##### FUNCTION panel_applet_factory_main ##### -->
<para>
</para>
@argc:
@argv:
@iid:
@name:
@version:
@callback:
@data:
@Returns:
<!-- ##### MACRO PANEL_APPLET_BONOBO_FACTORY ##### -->
<para>
Defines a 'main' routine for the applet factory.
</para>
@iid: The bonobo-activation iid of the factory.
@name: The applet ID string.
@version: The applet version string.
@callback: The factory callback.
@data: he factory user data pointer.
<!-- ##### SIGNAL PanelApplet::change-background ##### -->
<para>
Emitted when the background of the panel changes. Use @type to
......
2001-11-26 Mark McLoughlin <mark@skynet.ie>
* menu-fentry.c: (fr_fill_dir), (fr_read_dir): #ifdef out
debugging messages.
* quick-desktop-reader.c: (quick_desktop_item_load_uri): ditto.
* menu.c: (fake_mapped_fake), (show_item_menu),
(create_menu_at_fr): revert g_signal_connect_object changes
back to gtk_signal_connect_object. Giving out warnings and not
sure how to fix it.
Use g_signal_handlers_disconnect_matched instead of
g_signal_disconnect_by_func which doesn't exist.
* panel-widget.c: (panel_widget_applet_event):
reverse order of params in g_signal_lookup calls.
* panel.c: (basep_pos_connect_signals): revert
g_signal_connect_object changes back to
gtk_signal_connect_object. Giving out warnings and not sure
how to fix it.
2001-11-26 Mark McLoughlin <mark@skynet.ie>
* Makefile.am: cleanup libpanel-applet-2 building. Add
......
......@@ -333,8 +333,10 @@ fr_fill_dir (FileRec *fr, int sublevels)
continue;
}
#ifdef MENU_FENTRY_DEBUG
g_print ("fr->name = \"%s\" , mfile->name = \"%s\"\n",
fr->name, mfile->name);
#endif
name = g_build_path ("/", fr->name, mfile->name, NULL);
......@@ -350,7 +352,9 @@ fr_fill_dir (FileRec *fr, int sublevels)
if ( ! is_ext2 (mfile->name, ".desktop", ".kdelnk")) {
g_free (name);
free_mfile (mfile);
#ifdef MENU_FENTRY_DEBUG
g_print ("BAD EXTENSION\n");
#endif
continue;
}
......@@ -397,9 +401,12 @@ fr_fill_dir (FileRec *fr, int sublevels)
quick_desktop_item_destroy (qitem);
dr->recs = g_slist_prepend (dr->recs, ffr);
} else {
}
#ifdef MENU_FENTRY_DEBUG
else {
g_print ("NO QITEM\n");
}
#endif
}
g_free (name);
free_mfile (mfile);
......@@ -417,8 +424,10 @@ fr_read_dir (DirRec *dr, const char *muri, time_t mtime, int sublevels)
g_return_val_if_fail (muri != NULL, NULL);
#ifdef MENU_FENTRY_DEBUG
g_print ("fr_read_dir (..., \"%s\", %ld, %d)\n",
muri, (long)mtime, sublevels);
#endif
info = gnome_vfs_file_info_new ();
......
......@@ -800,10 +800,13 @@ fake_mapped_fake(GtkWidget *w, FakeIcon *fake)
if(!load_icons_id)
load_icons_id = g_idle_add(load_icons_handler, NULL);
g_signal_disconnect_by_func (G_OBJECT(w),
g_signal_handlers_disconnect_matched (G_OBJECT(w),
G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA,
0, 0, NULL,
G_CALLBACK (fake_mapped_fake),
fake);
toplevel = gtk_widget_get_toplevel(w);
gtk_signal_connect_while_alive(GTK_OBJECT(toplevel), "map",
G_CALLBACK(fake_mapped),
......@@ -1731,10 +1734,10 @@ show_item_menu (GtkWidget *item, GdkEventButton *bevent, ShowItemMenu *sim)
if (access (tmp, W_OK) != 0)
gtk_widget_set_sensitive(menuitem,FALSE);
g_free (tmp);
g_signal_connect_object (G_OBJECT (menuitem),
gtk_signal_connect_object (GTK_OBJECT (menuitem),
"activate",
G_CALLBACK (gtk_menu_shell_deactivate),
G_OBJECT (item->parent));
GTK_SIGNAL_FUNC (gtk_menu_shell_deactivate),
GTK_OBJECT (item->parent));
if ( ! sim->applet) {
menuitem = gtk_menu_item_new ();
......@@ -1784,10 +1787,11 @@ show_item_menu (GtkWidget *item, GdkEventButton *bevent, ShowItemMenu *sim)
menuitem = gtk_menu_item_new ();
/*when activated we must pop down the first menu*/
g_signal_connect_object (G_OBJECT(menuitem),
gtk_signal_connect_object (GTK_OBJECT (menuitem),
"activate",
G_CALLBACK(gtk_menu_shell_deactivate),
G_OBJECT(item->parent));
GTK_SIGNAL_FUNC (gtk_menu_shell_deactivate),
GTK_OBJECT (item->parent));
g_signal_connect (G_OBJECT(menuitem),
"activate",
G_CALLBACK(edit_dentry),
......@@ -1851,10 +1855,11 @@ show_item_menu (GtkWidget *item, GdkEventButton *bevent, ShowItemMenu *sim)
_("Add new item to this menu"));
gtk_menu_shell_append (GTK_MENU_SHELL (submenu), menuitem);
/*when activated we must pop down the first menu*/
g_signal_connect_object (G_OBJECT(menuitem),
gtk_signal_connect_object (GTK_OBJECT (menuitem),
"activate",
G_CALLBACK(gtk_menu_shell_deactivate),
G_OBJECT(item->parent));
GTK_SIGNAL_FUNC (gtk_menu_shell_deactivate),
GTK_OBJECT (item->parent));
g_signal_connect (G_OBJECT(menuitem), "activate",
G_CALLBACK(add_new_app_to_menu),
sim->mf->menudir);
......@@ -1864,10 +1869,11 @@ show_item_menu (GtkWidget *item, GdkEventButton *bevent, ShowItemMenu *sim)
menuitem = gtk_menu_item_new ();
/*when activated we must pop down the first menu*/
g_signal_connect_object (G_OBJECT(menuitem),
gtk_signal_connect_object (GTK_OBJECT (menuitem),
"activate",
G_CALLBACK(gtk_menu_shell_deactivate),
G_OBJECT(item->parent));
GTK_SIGNAL_FUNC (gtk_menu_shell_deactivate),
GTK_OBJECT (item->parent));
g_signal_connect (G_OBJECT (menuitem),
"activate",
G_CALLBACK (edit_direntry),
......@@ -3200,7 +3206,10 @@ create_menu_at_fr (GtkWidget *menu,
GSList *last_added = NULL;
for(li = dr->recs; li != NULL; li = li->next) {
FileRec *tfr = li->data;
#ifdef MENU_DEBUG
g_print ("FileRec: '%s'\n", tfr->name);
#endif /* MENU_DEBUG */
if (tfr->type == FILE_REC_SEP)
add_menu_separator (menu);
......
......@@ -2313,7 +2313,7 @@ panel_widget_applet_event(GtkWidget *widget, GdkEvent *event, gpointer data)
if (panel->currently_dragged_applet) {
g_signal_stop_emission
(G_OBJECT (widget),
g_signal_lookup (G_OBJECT (widget), "event"),
g_signal_lookup ("event", G_OBJECT_TYPE (widget)),
0);
return TRUE;
}
......@@ -2331,7 +2331,9 @@ panel_widget_applet_event(GtkWidget *widget, GdkEvent *event, gpointer data)
case GDK_BUTTON_RELEASE:
if (panel->currently_dragged_applet) {
g_signal_stop_emission
(GTK_OBJECT (widget), "event");
(G_OBJECT (widget),
g_signal_lookup ("event", G_OBJECT_TYPE (widget)),
0);
panel_widget_applet_drag_end(panel);
return TRUE;
}
......
......@@ -1558,24 +1558,24 @@ basep_pos_connect_signals (BasePWidget *basep)
}
if (ALIGNED_IS_WIDGET (basep))
g_signal_connect_object (G_OBJECT (basep->pos),
gtk_signal_connect_object (GTK_OBJECT (basep->pos),
"align_change",
G_CALLBACK (update_config_align),
G_OBJECT (basep));
GTK_SIGNAL_FUNC (update_config_align),
GTK_OBJECT (basep));
else if (FLOATING_IS_WIDGET (basep))
g_signal_connect_object (G_OBJECT (basep->pos),
gtk_signal_connect_object (GTK_OBJECT (basep->pos),
"floating_coords_change",
G_CALLBACK (update_config_floating_pos),
G_OBJECT(basep));
GTK_SIGNAL_FUNC (update_config_floating_pos),
GTK_OBJECT(basep));
else if (SLIDING_IS_WIDGET (basep)) {
g_signal_connect_object (G_OBJECT (basep->pos),
gtk_signal_connect_object (GTK_OBJECT (basep->pos),
"anchor_change",
G_CALLBACK (update_config_anchor),
G_OBJECT(basep));
g_signal_connect_object (G_OBJECT (basep->pos),
GTK_SIGNAL_FUNC (update_config_anchor),
GTK_OBJECT(basep));
gtk_signal_connect_object (GTK_OBJECT (basep->pos),
"offset_change",
G_CALLBACK (update_config_offset),
G_OBJECT (basep));
GTK_SIGNAL_FUNC (update_config_offset),
GTK_OBJECT (basep));
}
}
......
......@@ -56,6 +56,8 @@
#include "quick-desktop-reader.h"
#undef QUICK_DESKTOP_READER_DEBUG
/* This shares a lot of code with gnome-desktop-item, hmmm .... */
QuickDesktopItem *
......@@ -409,7 +411,11 @@ quick_desktop_item_load_uri (const char *uri,
if (retval != NULL &&
retval->name == NULL) {
#ifdef QUICK_DESKTOP_READER_DEBUG
g_print ("no name: %s\n", uri);
#endif /* QUICK_DESKTOP_READER_DEBUG */
quick_desktop_item_destroy (retval);
retval = NULL;
}
......
......@@ -50,7 +50,7 @@
#include "multiscreen-stuff.h"
#include "conditional.h"
#undef SESSION_DEBUG 1
#undef SESSION_DEBUG
int config_sync_timeout = 0;
int applets_to_sync = FALSE;
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment