GNOME.org
 

[gnome-panel] rename notification_area to notification-area

commit 86d75df0623d1b1b613cbbeacf5f4e29c1463152
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Mon Oct 31 07:34:17 2016 +0200

    rename notification_area to notification-area

 applets/Makefile.am                                |    2 +-
 .../Makefile.am                                    |    0
 .../fixedtip.c                                     |   12 +++---
 .../fixedtip.h                                     |    6 ++--
 .../main.c                                         |    6 ++--
 .../main.h                                         |    0
 .../na-tray-child.c                                |    2 +-
 .../na-tray-child.h                                |    0
 .../na-tray-manager.c                              |   36 ++++++++++----------
 .../na-tray-manager.h                              |    6 ++--
 .../na-tray.c                                      |   12 +++---
 .../na-tray.h                                      |    2 +-
 ...panel.NotificationAreaApplet.panel-applet.in.in |    0
 configure.ac                                       |    2 +-
 po/POTFILES.in                                     |    6 ++--
 15 files changed, 46 insertions(+), 46 deletions(-)
---
diff --git a/applets/Makefile.am b/applets/Makefile.am
index 1cf1359..eeb88d2 100644
--- a/applets/Makefile.am
+++ b/applets/Makefile.am
@@ -3,7 +3,7 @@ NULL =
 SUBDIRS = \
        clock \
        fish \
-       notification_area \
+       notification-area \
        wncklet \
        $(NULL)
 
diff --git a/applets/notification_area/Makefile.am b/applets/notification-area/Makefile.am
similarity index 100%
rename from applets/notification_area/Makefile.am
rename to applets/notification-area/Makefile.am
diff --git a/applets/notification_area/fixedtip.c b/applets/notification-area/fixedtip.c
similarity index 99%
rename from applets/notification_area/fixedtip.c
rename to applets/notification-area/fixedtip.c
index a908244..d3876b4 100644
--- a/applets/notification_area/fixedtip.c
+++ b/applets/notification-area/fixedtip.c
@@ -1,9 +1,9 @@
 /* Metacity fixed tooltip routine */
 
-/* 
+/*
  * Copyright (C) 2001 Havoc Pennington
  * Copyright (C) 2003-2006 Vincent Untz
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation; either version 2 of the
@@ -13,7 +13,7 @@
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
@@ -155,7 +155,7 @@ na_fixed_tip_position (NaFixedTip *fixedtip)
 
   /* pad between panel and message window */
 #define PAD 5
-  
+
   if (fixedtip->priv->orientation == GTK_ORIENTATION_VERTICAL)
     {
       if (root_x <= screen_width / 2)
@@ -177,7 +177,7 @@ na_fixed_tip_position (NaFixedTip *fixedtip)
 
   if ((root_y + req.height) > screen_height)
     root_y = screen_height - req.height;
-  
+
   gtk_window_move (GTK_WINDOW (fixedtip), root_x, root_y);
 }
 
@@ -215,7 +215,7 @@ na_fixed_tip_new (GtkWidget      *parent,
   //FIXME: would be nice to be able to get the toplevel for the tip, but this
   //doesn't work
   GtkWidget  *toplevel;
-  
+
   toplevel = gtk_widget_get_toplevel (parent);
   /*
   if (toplevel && gtk_widget_is_toplevel (toplevel) && GTK_IS_WINDOW (toplevel))
diff --git a/applets/notification_area/fixedtip.h b/applets/notification-area/fixedtip.h
similarity index 99%
rename from applets/notification_area/fixedtip.h
rename to applets/notification-area/fixedtip.h
index a05b6d3..a1c6204 100644
--- a/applets/notification_area/fixedtip.h
+++ b/applets/notification-area/fixedtip.h
@@ -1,9 +1,9 @@
 /* Fixed tooltip routine */
 
-/* 
+/*
  * Copyright (C) 2001 Havoc Pennington, 2002 Red Hat Inc.
  * Copyright (C) 2003-2006 Vincent Untz
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation; either version 2 of the
@@ -13,7 +13,7 @@
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
diff --git a/applets/notification_area/main.c b/applets/notification-area/main.c
similarity index 99%
rename from applets/notification_area/main.c
rename to applets/notification-area/main.c
index f807846..dd5f258 100644
--- a/applets/notification_area/main.c
+++ b/applets/notification-area/main.c
@@ -1,9 +1,9 @@
 /* System tray main() */
 
-/* 
+/*
  * Copyright (C) 2002 Red Hat, Inc.
  * Copyright (C) 2003-2006 Vincent Untz
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation; either version 2 of the
@@ -13,7 +13,7 @@
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
diff --git a/applets/notification_area/main.h b/applets/notification-area/main.h
similarity index 100%
rename from applets/notification_area/main.h
rename to applets/notification-area/main.h
diff --git a/applets/notification_area/na-tray-child.c b/applets/notification-area/na-tray-child.c
similarity index 99%
rename from applets/notification_area/na-tray-child.c
rename to applets/notification-area/na-tray-child.c
index 00feeea..364f0d4 100644
--- a/applets/notification_area/na-tray-child.c
+++ b/applets/notification-area/na-tray-child.c
@@ -323,7 +323,7 @@ na_tray_child_get_title (NaTrayChild *child)
                                False, utf8_string,
                                &type, &format, &nitems,
                                &bytes_after, (guchar **)&val);
-  
+
   if (gdk_error_trap_pop () || result != Success)
     return NULL;
 
diff --git a/applets/notification_area/na-tray-child.h b/applets/notification-area/na-tray-child.h
similarity index 100%
rename from applets/notification_area/na-tray-child.h
rename to applets/notification-area/na-tray-child.h
diff --git a/applets/notification_area/na-tray-manager.c b/applets/notification-area/na-tray-manager.c
similarity index 99%
rename from applets/notification_area/na-tray-manager.c
rename to applets/notification-area/na-tray-manager.c
index 755c31f..6d5a845 100644
--- a/applets/notification_area/na-tray-manager.c
+++ b/applets/notification-area/na-tray-manager.c
@@ -52,7 +52,7 @@ typedef struct
 {
   long id, len;
   long remaining_len;
-  
+
   long timeout;
   char *str;
 #ifdef GDK_WINDOWING_X11
@@ -121,7 +121,7 @@ static void
 na_tray_manager_class_init (NaTrayManagerClass *klass)
 {
   GObjectClass *gobject_class;
-  
+
   gobject_class = (GObjectClass *)klass;
 
   gobject_class->finalize = na_tray_manager_finalize;
@@ -140,7 +140,7 @@ na_tray_manager_class_init (NaTrayManagerClass *klass)
                                                      G_PARAM_STATIC_NAME |
                                                      G_PARAM_STATIC_NICK |
                                                      G_PARAM_STATIC_BLURB));
-  
+
   manager_signals[TRAY_ICON_ADDED] =
     g_signal_new ("tray_icon_added",
                  G_OBJECT_CLASS_TYPE (klass),
@@ -199,14 +199,14 @@ static void
 na_tray_manager_finalize (GObject *object)
 {
   NaTrayManager *manager;
-  
+
   manager = NA_TRAY_MANAGER (object);
 
   na_tray_manager_unmanage (manager);
 
   g_list_free (manager->messages);
   g_hash_table_destroy (manager->socket_table);
-  
+
   G_OBJECT_CLASS (na_tray_manager_parent_class)->finalize (object);
 }
 
@@ -334,7 +334,7 @@ na_tray_manager_handle_message_data (NaTrayManager       *manager,
 {
   GList *p;
   int    len;
-  
+
   /* Try to see if we can find the pending message in the list */
   for (p = manager->messages; p; p = p->next)
     {
@@ -436,7 +436,7 @@ na_tray_manager_handle_cancel_message (NaTrayManager       *manager,
   long       id;
 
   id = xevent->data.l[2];
-  
+
   /* Check if the message is in the queue and remove it if so */
   for (p = manager->messages; p; p = p->next)
     {
@@ -454,7 +454,7 @@ na_tray_manager_handle_cancel_message (NaTrayManager       *manager,
 
   socket = g_hash_table_lookup (manager->socket_table,
                                 GINT_TO_POINTER (xevent->window));
-  
+
   if (socket)
     {
       g_signal_emit (manager, manager_signals[MESSAGE_CANCELLED], 0,
@@ -526,7 +526,7 @@ na_tray_manager_selection_clear_event (GtkWidget         *widget,
   return FALSE;
 }
 #endif
-#endif  
+#endif
 
 static void
 na_tray_manager_unmanage (NaTrayManager *manager)
@@ -546,9 +546,9 @@ na_tray_manager_unmanage (NaTrayManager *manager)
   g_assert (GTK_IS_INVISIBLE (invisible));
   g_assert (gtk_widget_get_realized (invisible));
   g_assert (GDK_IS_WINDOW (window));
-  
+
   display = gtk_widget_get_display (invisible);
-  
+
   if (gdk_selection_owner_get_for_display (display, manager->selection_atom) ==
       window)
     {
@@ -561,7 +561,7 @@ na_tray_manager_unmanage (NaTrayManager *manager)
     }
 
   gdk_window_remove_filter (window,
-                            na_tray_manager_window_filter, manager);  
+                            na_tray_manager_window_filter, manager);
 
   manager->invisible = NULL; /* prior to destroy for reentrancy paranoia */
   gtk_widget_destroy (invisible);
@@ -755,7 +755,7 @@ na_tray_manager_manage_screen_x11 (NaTrayManager *manager,
   GdkWindow  *window;
   char       *selection_atom_name;
   guint32     timestamp;
-  
+
   g_return_val_if_fail (NA_IS_TRAY_MANAGER (manager), FALSE);
   g_return_val_if_fail (manager->screen == NULL, FALSE);
 
@@ -766,15 +766,15 @@ na_tray_manager_manage_screen_x11 (NaTrayManager *manager,
   if (na_tray_manager_check_running_screen_x11 (screen))
     return FALSE;
 #endif
-  
+
   manager->screen = screen;
 
   display = gdk_screen_get_display (screen);
   xscreen = GDK_SCREEN_XSCREEN (screen);
-  
+
   invisible = gtk_invisible_new_for_screen (screen);
   gtk_widget_realize (invisible);
-  
+
   gtk_widget_add_events (invisible,
                          GDK_PROPERTY_CHANGE_MASK | GDK_STRUCTURE_MASK);
 
@@ -791,7 +791,7 @@ na_tray_manager_manage_screen_x11 (NaTrayManager *manager,
   na_tray_manager_set_padding_property (manager);
   na_tray_manager_set_icon_size_property (manager);
   na_tray_manager_set_colors_property (manager);
-  
+
   window = gtk_widget_get_window (invisible);
 
   timestamp = gdk_x11_get_server_time (window);
@@ -851,7 +851,7 @@ na_tray_manager_manage_screen_x11 (NaTrayManager *manager,
       manager->invisible = NULL;
 
       manager->screen = NULL;
- 
+
       return FALSE;
     }
 }
diff --git a/applets/notification_area/na-tray-manager.h b/applets/notification-area/na-tray-manager.h
similarity index 99%
rename from applets/notification_area/na-tray-manager.h
rename to applets/notification-area/na-tray-manager.h
index 77506c0..1fede4a 100644
--- a/applets/notification_area/na-tray-manager.h
+++ b/applets/notification-area/na-tray-manager.h
@@ -37,7 +37,7 @@ G_BEGIN_DECLS
 #define NA_IS_TRAY_MANAGER(obj)                        (G_TYPE_CHECK_INSTANCE_TYPE ((obj), 
NA_TYPE_TRAY_MANAGER))
 #define NA_IS_TRAY_MANAGER_CLASS(klass)                (G_TYPE_CHECK_CLASS_TYPE ((klass), 
NA_TYPE_TRAY_MANAGER))
 #define NA_TRAY_MANAGER_GET_CLASS(obj)         (G_TYPE_INSTANCE_GET_CLASS ((obj), NA_TYPE_TRAY_MANAGER, 
NaTrayManagerClass))
-       
+
 typedef struct _NaTrayManager      NaTrayManager;
 typedef struct _NaTrayManagerClass  NaTrayManagerClass;
 
@@ -50,7 +50,7 @@ struct _NaTrayManager
   Atom    opcode_atom;
   Atom    message_data_atom;
 #endif
-  
+
   GtkWidget *invisible;
   GdkScreen *screen;
   GtkOrientation orientation;
@@ -79,7 +79,7 @@ struct _NaTrayManagerClass
                              const gchar        *message,
                              glong               id,
                              glong               timeout);
-  
+
   void (* message_cancelled) (NaTrayManager      *manager,
                              NaTrayChild        *child,
                              glong               id);
diff --git a/applets/notification_area/na-tray.c b/applets/notification-area/na-tray.c
similarity index 99%
rename from applets/notification_area/na-tray.c
rename to applets/notification-area/na-tray.c
index 76d6bae..d6f1cb2 100644
--- a/applets/notification_area/na-tray.c
+++ b/applets/notification-area/na-tray.c
@@ -12,7 +12,7 @@
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
@@ -88,7 +88,7 @@ get_tray (TraysScreen *trays_screen)
 {
   if (trays_screen->all_trays == NULL)
     return NULL;
-  
+
   return trays_screen->all_trays->data;
 }
 
@@ -372,7 +372,7 @@ message_sent (NaTrayManager *manager,
   icontip = g_hash_table_lookup (trays_screen->tip_table, icon);
 
   find_buffer.id = id;
-  if (icontip && 
+  if (icontip &&
       (icontip->id == id ||
        g_slist_find_custom (icontip->buffer, &find_buffer,
                             icon_tip_buffer_compare) != NULL))
@@ -623,7 +623,7 @@ na_tray_constructor (GType type,
           g_object_unref (tray_manager);
         }
     }
-      
+
   priv->trays_screen = &trays_screens [screen_number];
   trays_screens [screen_number].all_trays = g_slist_append (trays_screens [screen_number].all_trays,
                                                             tray);
@@ -747,7 +747,7 @@ na_tray_class_init (NaTrayClass *klass)
                        G_PARAM_STATIC_NAME |
                        G_PARAM_STATIC_NICK |
                        G_PARAM_STATIC_BLURB));
-  
+
   g_object_class_install_property
     (gobject_class,
      PROP_SCREEN,
@@ -780,7 +780,7 @@ na_tray_set_orientation (NaTray         *tray,
 
   if (orientation == priv->orientation)
     return;
-  
+
   priv->orientation = orientation;
 
   update_size_and_orientation (tray);
diff --git a/applets/notification_area/na-tray.h b/applets/notification-area/na-tray.h
similarity index 99%
rename from applets/notification_area/na-tray.h
rename to applets/notification-area/na-tray.h
index c7bc443..49f0f65 100644
--- a/applets/notification_area/na-tray.h
+++ b/applets/notification-area/na-tray.h
@@ -35,7 +35,7 @@ G_BEGIN_DECLS
 #define NA_IS_TRAY(obj)                        (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NA_TYPE_TRAY))
 #define NA_IS_TRAY_CLASS(klass)                (G_TYPE_CHECK_CLASS_TYPE ((klass), NA_TYPE_TRAY))
 #define NA_TRAY_GET_CLASS(obj)         (G_TYPE_INSTANCE_GET_CLASS ((obj), NA_TYPE_TRAY, NaTrayClass))
-       
+
 typedef struct _NaTray         NaTray;
 typedef struct _NaTrayPrivate  NaTrayPrivate;
 typedef struct _NaTrayClass    NaTrayClass;
diff --git a/applets/notification_area/org.gnome.panel.NotificationAreaApplet.panel-applet.in.in 
b/applets/notification-area/org.gnome.panel.NotificationAreaApplet.panel-applet.in.in
similarity index 100%
rename from applets/notification_area/org.gnome.panel.NotificationAreaApplet.panel-applet.in.in
rename to applets/notification-area/org.gnome.panel.NotificationAreaApplet.panel-applet.in.in
diff --git a/configure.ac b/configure.ac
index aac6b2f..d29881b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -278,7 +278,7 @@ AC_CONFIG_FILES([
   applets/clock/Makefile
   applets/clock/pixmaps/Makefile
   applets/fish/Makefile
-  applets/notification_area/Makefile
+  applets/notification-area/Makefile
   applets/status-notifier/Makefile
   applets/wncklet/Makefile
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index a982adb..0044708 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -14,9 +14,9 @@ applets/fish/fish-applet.c
 applets/fish/fish-module.c
 [type: gettext/glade]applets/fish/fish-menu.ui
 [type: gettext/glade]applets/fish/fish.ui
-applets/notification_area/main.c
-applets/notification_area/na-tray-manager.c
-[type: gettext/ini]applets/notification_area/org.gnome.panel.NotificationAreaApplet.panel-applet.in.in
+applets/notification-area/na-applet.c
+applets/notification-area/na-tray-manager.c
+[type: gettext/ini]applets/notification-area/org.gnome.panel.NotificationAreaApplet.panel-applet.in.in
 [type: gettext/ini]applets/status-notifier/org.gnome.panel.SnApplet.panel-applet.in.in
 [type: gettext/ini]applets/wncklet/org.gnome.panel.Wncklet.panel-applet.in.in
 applets/wncklet/showdesktop.c
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]